From: VMware, Inc <>
Date: Mon, 22 Mar 2010 22:17:57 +0000 (-0700)
Subject: VMXNET: Fix compilation on kernel 2.6.34-rc1+
X-Git-Tag: 2010.03.20-243334~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3a3262bbff6b1b72f058b886c34f0b7e9db9d2e;p=thirdparty%2Fopen-vm-tools.git

VMXNET: Fix compilation on kernel 2.6.34-rc1+

change_mtu() method was removed from netdevice and moved into
net_device_ops. HAVE_CHANGE_MTU was removed as well which
caused vmxnet_change_mtu to be omitted but it is still needed.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet.c b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
index 3c70bc1fc..e23ce629c 100644
--- a/open-vm-tools/modules/linux/vmxnet/vmxnet.c
+++ b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
@@ -78,7 +78,7 @@ static int vmxnet_close(struct net_device *dev);
 static void vmxnet_set_multicast_list(struct net_device *dev);
 static int vmxnet_set_mac_address(struct net_device *dev, void *addr);
 static struct net_device_stats *vmxnet_get_stats(struct net_device *dev);
-#ifdef HAVE_CHANGE_MTU
+#if defined(HAVE_CHANGE_MTU) || defined(HAVE_NET_DEVICE_OPS)
 static int vmxnet_change_mtu(struct net_device *dev, int new_mtu);
 #endif
 
@@ -271,7 +271,7 @@ static struct pci_driver vmxnet_driver = {
 #endif
                                          };
 
-#ifdef HAVE_CHANGE_MTU
+#if defined(HAVE_CHANGE_MTU) || defined(HAVE_NET_DEVICE_OPS)
 static int
 vmxnet_change_mtu(struct net_device *dev, int new_mtu)
 {