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

Timestamp:

May 6, 2015 1:03:20 AM (10 years ago)

Author:

vboxsync

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

100073

Message:

VBoxNetFlt/linux: *sigh*, revert previous... note to self, don't edit
the file while svn waits for the password.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (2 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 0
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-# 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
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
-# define VBOX_DEV_NET(dev)                  dev_net(dev)
-#else
-# define VBOX_DEV_NET(dev)                  ((dev)->nd_net)
 #endif
 
@@ -2174 +2160 @@
     if (pThis->pSwitchPort->pfnNotifyHostAddress)
     {
-        struct net *net = VBOX_DEV_NET(pThis->u.s.pDev);
+        struct net *net = dev_net(pThis->u.s.pDev);
         struct net_device *dev;