Changeset 70708 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

Timestamp:

Jan 23, 2018 3:02:52 PM (7 years ago)

Author:

vboxsync

Message:

NetFlt/Linux: vboxNetFltLinuxAttachToInterface - g/c error handling
code that has been unreachable since r39185. Ok aleksey.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -1871 +1871 @@
 
     /*
-     * If the above succeeded report GSO capabilities,  if not undo and
-     * release the device.
-     */
-    if (!pDev)
-    {
-        Assert(pThis->pSwitchPort);
-        if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
-        {
-            vboxNetFltLinuxReportNicGsoCapabilities(pThis);
-            pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-            pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltLinuxPromiscuous(pThis));
-            pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-            vboxNetFltRelease(pThis, true /*fBusy*/);
-        }
-    }
-    else
-    {
-#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
-        vboxNetFltLinuxUnhookDev(pThis, pDev);
-#endif
-        RTSpinlockAcquire(pThis->hSpinlock);
-        ASMAtomicUoWriteNullPtr(&pThis->u.s.pDev);
-        RTSpinlockRelease(pThis->hSpinlock);
-        dev_put(pDev);
-        Log(("vboxNetFltLinuxAttachToInterface: Device %p(%s) released. ref=%d\n",
-             pDev, pDev->name,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-             netdev_refcnt_read(pDev)
-#else
-             atomic_read(&pDev->refcnt)
-#endif
-             ));
+     * Report GSO capabilities
+     */
+    Assert(pThis->pSwitchPort);
+    if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+    {
+        vboxNetFltLinuxReportNicGsoCapabilities(pThis);
+        pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+        pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltLinuxPromiscuous(pThis));
+        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+        vboxNetFltRelease(pThis, true /*fBusy*/);
     }