Changeset 33506 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Oct 27, 2010 1:27:08 PM (14 years ago)

Author:

vboxsync

Message:

vboxnetflt: tap link state fix for linux kernels 2.6.36 and above (#5328)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)

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

@@ -1906 +1906 @@
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+/**
+ * Helper for detecting TAP devices.
+ */
+static bool vboxNetFltIsTapDevice(PVBOXNETFLTINS pThis, struct net_device *pDev)
+{
+    if (pDev->ethtool_ops && pDev->ethtool_ops->get_drvinfo)
+    {
+        struct ethtool_drvinfo Info;
+
+        memset(&Info, 0, sizeof(Info));
+        Info.cmd = ETHTOOL_GDRVINFO;
+        pDev->ethtool_ops->get_drvinfo(pDev, &Info);
+        Log3(("vboxNetFltIsTapDevice: driver=%s version=%s bus_info=%s\n",
+              Info.driver, Info.version, Info.bus_info));
+
+        return !strncmp(Info.driver,   "tun", 4)
+            && !strncmp(Info.bus_info, "tap", 4);
+    }
+
+    return false;
+}
+
+/**
+ * Helper for updating the link state of TAP devices.
+ * Only TAP devices are affected.
+ */
+static void vboxNetFltSetTapLinkState(PVBOXNETFLTINS pThis, struct net_device *pDev, bool fLinkUp)
+{
+    if (vboxNetFltIsTapDevice(pThis, pDev))
+    {
+        Log3(("vboxNetFltSetTapLinkState: bringing %s tap device link state\n",
+              fLinkUp ? "up" : "down"));
+        netif_tx_lock_bh(pDev);
+        if (fLinkUp)
+            netif_carrier_on(pDev);
+        else
+            netif_carrier_off(pDev);
+        netif_tx_unlock_bh(pDev);
+    }
+}
+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) */
+DECLINLINE(void) vboxNetFltSetTapLinkState(PVBOXNETFLTINS pThis, struct net_device *pDev, bool fLinkUp)
+{
+    /* Nothing to do for pre-2.6.36 kernels. */
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) */
+
 /**
  * Internal worker for vboxNetFltLinuxNotifierCallback.
@@ -1948 +1996 @@
     vboxNetFltLinuxQdiscInstall(pThis, pDev);
 #endif /* VBOXNETFLT_WITH_QDISC */
+
+    /*
+     * If attaching to TAP interface we need to bring the link state up
+     * starting from 2.6.36 kernel.
+     */
+    vboxNetFltSetTapLinkState(pThis, pDev, true);
 
     /*
@@ -2321 +2375 @@
     if (fRegistered)
     {
+        vboxNetFltSetTapLinkState(pThis, pDev, false);
+
 #ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
         skb_queue_purge(&pThis->u.s.XmitQueue);