Dominique Leuenberger
28ab190c87
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=207
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
Index: modules/linux/shared/compat_netdevice.h
|
|
===================================================================
|
|
--- modules/linux/shared/compat_netdevice.h.orig
|
|
+++ modules/linux/shared/compat_netdevice.h
|
|
@@ -182,7 +182,7 @@ compat_alloc_netdev(int priv_size,
|
|
* All compat_* business is good but when we can we should just provide
|
|
* missing implementation to ease upstreaming task.
|
|
*/
|
|
-#ifndef HAVE_ALLOC_NETDEV
|
|
+#if !defined(HAVE_ALLOC_NETDEV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
|
#define alloc_netdev(sz, name, setup) compat_alloc_netdev(sz, name, setup)
|
|
#define alloc_etherdev(sz) compat_alloc_etherdev(sz)
|
|
#endif
|
|
@@ -191,7 +191,7 @@ compat_alloc_netdev(int priv_size,
|
|
#define free_netdev(dev) kfree(dev)
|
|
#endif
|
|
|
|
-#ifndef HAVE_NETDEV_PRIV
|
|
+#if !defined(HAVE_NETDEV_PRIV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
|
#define netdev_priv(dev) ((dev)->priv)
|
|
#endif
|
|
|
|
@@ -203,7 +203,7 @@ compat_alloc_netdev(int priv_size,
|
|
# define COMPAT_NETDEV_TX_BUSY 1
|
|
#endif
|
|
|
|
-#ifndef HAVE_NETIF_QUEUE
|
|
+#if !defined(HAVE_NETIF_QUEUE) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
|
static inline void
|
|
netif_start_queue(struct device *dev)
|
|
{
|
|
Index: modules/linux/vmxnet/vmxnet.c
|
|
===================================================================
|
|
--- modules/linux/vmxnet/vmxnet.c.orig
|
|
+++ modules/linux/vmxnet/vmxnet.c
|
|
@@ -64,6 +64,10 @@ static int vmxnet_debug = 1;
|
|
#define VMW_HAVE_POLL_CONTROLLER
|
|
#endif
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
|
|
+#define HAVE_NET_DEVICE_OPS
|
|
+#endif
|
|
+
|
|
static int vmxnet_open(struct net_device *dev);
|
|
static int vmxnet_start_tx(struct sk_buff *skb, struct net_device *dev);
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|