Changeset 36874 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2011 11:49:50 AM (14 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFltBow: cleanup.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

@@ -226 +226 @@
     /** The unicast address handle.  */
     mac_unicast_handle_t        hUnicast;
-    /** The promiscuous handle (currently unused). */
-    mac_promisc_handle_t        hPromiscuous;
     /* The VNIC name. */
     char                        szName[MAXLINKNAMESPECIFIER];
@@ -943 +941 @@
     pVNIC->hClient         = NULL;
     pVNIC->hUnicast        = NULL;
-    pVNIC->hPromiscuous    = NULL;
     RT_ZERO(pVNIC->szName);
     list_link_init(&pVNIC->hNode);
@@ -955 +952 @@
  * @param   pVNIC           Pointer to the VNIC.
  */
-LOCAL void vboxNetFltSolarisFreeVNIC(PVBOXNETFLTVNIC pVNIC)
+LOCAL inline void vboxNetFltSolarisFreeVNIC(PVBOXNETFLTVNIC pVNIC)
 {
     if (pVNIC)
@@ -972 +969 @@
     if (pVNIC)
     {
-        if (pVNIC->hPromiscuous)
-        {
-            mac_promisc_remove(pVNIC->hPromiscuous);
-            pVNIC->hPromiscuous = NULL;
-        }
-
         if (pVNIC->hClient)
         {
@@ -1190 +1181 @@
                 mac_rx_clear(pVNIC->hClient);
     }
-
-
-#if 0
-    if (fActive)
-    {
-        /*
-         * Activate promiscuous mode.
-         */
-        if (!pThis->u.s.hPromiscuous)
-        {
-            int rc = mac_promisc_add(pThis->u.s.hClient, MAC_CLIENT_PROMISC_ALL, vboxNetFltSolarisRecv, pThis, &pThis->u.s.hPromiscuous,
-                                    MAC_PROMISC_FLAGS_NO_TX_LOOP);
-            if (rc)
-                LogRel((DEVICE_NAME ":vboxNetFltPortOsSetActive cannot enable promiscuous mode for '%s' rc=%d\n", pThis->szName, rc));
-        }
-    }
-    else
-    {
-        /*
-         * Deactivate promiscuous mode.
-         */
-        if (pThis->u.s.hPromiscuous)
-        {
-            mac_promisc_remove(pThis->u.s.hPromiscuous);
-            pThis->u.s.hPromiscuous = NULL;
-        }
-    }
-#endif
 }