Attachment #387292 for bug #526636

Lines 337-340 typedef netdev_features_t compat_netdev_features_t; Link Here

(-)a/open-vm-tools/modules/linux/shared/compat_netdevice.h (+4 lines)
337	typedef u32 compat_netdev_features_t;	337	typedef u32 compat_netdev_features_t;
338	#endif	338	#endif
339		339
		340	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) \|\| defined(SET_ETHTOOL_OPS)
		341	#define VMW_HAVE_ETHTOOL_OPS 1
		342	#endif
		343
340	#endif /* __COMPAT_NETDEVICE_H__ */	344	#endif /* __COMPAT_NETDEVICE_H__ */





#endif

#ifdef VMW_HAVE_ETHTOOL_OPS
#ifdef SET_ETHTOOL_OPS
/*
 *----------------------------------------------------------------------------
 *

};


#else   /* !defined(VMW_HAVE_ETHTOOL_OPS) */


/*

   }
   return -EOPNOTSUPP;
}
#endif /* !defined(VMW_HAVE_ETHTOOL_OPS) */


/*

   dev->watchdog_timeo = VMXNET_WATCHDOG_TIMEOUT;
#endif

#ifdef VMW_HAVE_ETHTOOL_OPS
#  ifdef SET_ETHTOOL_OPS
   SET_ETHTOOL_OPS(dev, &vmxnet_ethtool_ops);
#  else
   dev->ethtool_ops = &vmxnet_ethtool_ops;
#  endif
#else
   dev->do_ioctl = vmxnet_ioctl;
#endif
- 

Return to bug 526636

Lines 283-290 vmxnet_change_mtu(struct net_device *dev, int new_mtu) Link Here

(-)a/open-vm-tools/modules/linux/vmxnet/vmxnet.c (-6 / +8 lines)
283		283
284	#endif	284	#endif
285		285
286		286	#ifdef VMW_HAVE_ETHTOOL_OPS
287	#ifdef SET_ETHTOOL_OPS
288	/*	287	/*
289	*----------------------------------------------------------------------------	288	*----------------------------------------------------------------------------
290	*	289	*
Lines 530-536 vmxnet_ethtool_ops = { Link Here
530	};	529	};
531		530
532		531
533	#else /* !defined(SET_ETHTOOL_OPS) */	532	#else /* !defined(VMW_HAVE_ETHTOOL_OPS) */
534		533
535		534
536	/*	535	/*
Lines 743-749 vmxnet_ioctl(struct net_device dev, struct ifreq ifr, int cmd) Link Here
743	}	742	}
744	return -EOPNOTSUPP;	743	return -EOPNOTSUPP;
745	}	744	}
746	#endif /* SET_ETHTOOL_OPS */	745	#endif /* !defined(VMW_HAVE_ETHTOOL_OPS) */
747		746
748		747
749	/*	748	/*
Lines 1142-1149 vmxnet_probe_device(struct pci_dev *pdev, // IN: vmxnet PCI device Link Here
1142	dev->watchdog_timeo = VMXNET_WATCHDOG_TIMEOUT;	1141	dev->watchdog_timeo = VMXNET_WATCHDOG_TIMEOUT;
1143	#endif	1142	#endif
1144		1143
1145	#ifdef SET_ETHTOOL_OPS	1144	#ifdef VMW_HAVE_ETHTOOL_OPS
		1145	# ifdef SET_ETHTOOL_OPS
1146	SET_ETHTOOL_OPS(dev, &vmxnet_ethtool_ops);	1146	SET_ETHTOOL_OPS(dev, &vmxnet_ethtool_ops);
		1147	# else
		1148	dev->ethtool_ops = &vmxnet_ethtool_ops;
		1149	# endif
1147	#else	1150	#else
1148	dev->do_ioctl = vmxnet_ioctl;	1151	dev->do_ioctl = vmxnet_ioctl;
1149	#endif	1152	#endif
1150	-