Changeset 20779 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jun 22, 2009 1:31:15 PM (16 years ago)

Author:

vboxsync

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

48899

Message:

Use net_device_ops in vboxnetadp.ko, kernels 2.6.29 and above.

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (2 diffs)

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

@@ -162 +162 @@
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+static const struct net_device_ops vboxNetAdpNetdevOps = {
+    .ndo_open               = vboxNetAdpLinuxOpen,
+    .ndo_stop               = vboxNetAdpLinuxStop,
+    .ndo_start_xmit         = vboxNetAdpLinuxXmit,
+    .ndo_get_stats          = vboxNetAdpLinuxGetStats
+};
+#endif
+
 static void vboxNetAdpNetDevInit(struct net_device *pNetDev)
 {
@@ -167 +176 @@
 
     ether_setup(pNetDev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+    pNetDev->netdev_ops = &vboxNetAdpNetdevOps;
+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
     pNetDev->open = vboxNetAdpLinuxOpen;
     pNetDev->stop = vboxNetAdpLinuxStop;
     pNetDev->hard_start_xmit = vboxNetAdpLinuxXmit;
     pNetDev->get_stats = vboxNetAdpLinuxGetStats;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
 
     pPriv = netdev_priv(pNetDev);