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

Timestamp:

May 6, 2015 1:29:06 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100075

Message:

VBoxNetFlt/linux: netdev_name() officially appeared in 2.6.34.

File:

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

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

@@ -68 +68 @@
 #ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
 # define VBOX_FLT_XT_TO_INST(pXT)   RT_FROM_MEMBER(pXT, VBOXNETFLTINS, u.s.XmitTask)
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
+# define VBOX_NETDEV_NAME(dev)              netdev_name(dev)
+#else
+# define VBOX_NETDEV_NAME(dev)              ((dev)->reg_state != NETREG_REGISTERED ? "(unregistered net_device)" : (dev)->name)
 #endif
 
@@ -1876 +1882 @@
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
     Log(("VBoxNetFlt: %s: IPv4 event %s(0x%lx): addr %RTnaipv4 mask %RTnaipv4\n",
-         pDev ? netdev_name(pDev) : "<???>",
+         pDev ? VBOX_NETDEV_NAME(pDev) : "<???>",
          vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType,
          ifa->ifa_address, ifa->ifa_mask));
@@ -1910 +1916 @@
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
     Log(("VBoxNetFlt: %s: IPv6 event %s(0x%lx): %RTnaipv6\n",
-         pDev ? netdev_name(pDev) : "<???>",
+         pDev ? VBOX_NETDEV_NAME(pDev) : "<???>",
          vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType,
          &ifa->addr));
@@ -2186 +2192 @@
 
                     Log(("%s: %s: IPv4: addr %RTnaipv4 mask %RTnaipv4\n",
-                         __FUNCTION__, netdev_name(dev),
+                         __FUNCTION__, VBOX_NETDEV_NAME(dev),
                          ifa->ifa_address, ifa->ifa_mask));
 
@@ -2206 +2212 @@
                 {
                     Log(("%s: %s: IPv6: addr %RTnaipv6/%u\n",
-                         __FUNCTION__, netdev_name(dev),
+                         __FUNCTION__, VBOX_NETDEV_NAME(dev),
                          &ifa->addr, (unsigned)ifa->prefix_len));