Imported Upstream version 4.0.8-dfsgupstream/4.0.8-dfsg

1 files changed, 9 insertions, 0 deletions

diff --git a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp
index 29dbaed34..b9bb415ba 100644
--- a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp
+++ b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp
@@ -90,6 +90,7 @@ static void vboxSolarisAddHostIface(char *pszIface, int Instance, void *pvHostNe
         SolarisNICMap.insert(NICPair("skge", "SksKonnect Gigabit Ethernet"));
         SolarisNICMap.insert(NICPair("spwr", "SMC EtherPower II 10/100 (9432) Ethernet"));
         SolarisNICMap.insert(NICPair("vboxnet", "VirtualBox Host Ethernet"));
+        SolarisNICMap.insert(NICPair("vboxvnic_template", "VirtualBox Virtual Network Interface Template"));
         SolarisNICMap.insert(NICPair("vlan", "Virtual LAN Ethernet"));
         SolarisNICMap.insert(NICPair("vnic", "Virtual Network Interface Ethernet"));
         SolarisNICMap.insert(NICPair("xge", "Neterior Xframe 10Gigabit Ethernet"));
@@ -211,6 +212,14 @@ static boolean_t vboxSolarisAddLinkHostIface(const char *pszIface, void *pvHostN
         return _B_FALSE;
 
     /*
+     * Skip our own dynamic VNICs but don't skip VNIC templates.
+     * These names originate from VBoxNetFltBow-solaris.c, hardcoded here for now.
+     */
+    if (    strncmp(pszIface, "vboxvnic_template", 17)
+        && !strncmp(pszIface, "vboxvnic", 8))
+        return _B_FALSE;
+
+    /*
      * Clip off the zone instance number from the interface name (if any).
      */
     char szIfaceName[128];