rpms/ndiswrapper-kmod/F-16 ndiswrapper_3.3_kernel.patch,NONE,1.1

[Leigh Scott]

Author: leigh123linux

Update of /cvs/free/rpms/ndiswrapper-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24994

Added Files:
	ndiswrapper_3.3_kernel.patch 
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux at googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag


ndiswrapper_3.3_kernel.patch:
 ndis.c     |    6 ++++++
 wrapndis.c |    4 ++++
 2 files changed, 10 insertions(+)

--- NEW FILE ndiswrapper_3.3_kernel.patch ---
--- a/driver/wrapndis.c	2012/03/26 17:00:31	3107
+++ b/driver/wrapndis.c	2012/03/26 17:01:18	3108
@@ -1675,6 +1675,7 @@
 	return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
 static u32 ndis_get_tx_csum(struct net_device *dev)
 {
 	struct ndis_device *wnd = netdev_priv(dev);
@@ -1735,18 +1736,21 @@
 	else
 		return -EOPNOTSUPP;
 }
+#endif
 
 static struct ethtool_ops ndis_ethtool_ops = {
 	.get_drvinfo	= ndis_get_drvinfo,
 	.get_link	= ndis_get_link,
 	.get_wol	= ndis_get_wol,
 	.set_wol	= ndis_set_wol,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
 	.get_tx_csum	= ndis_get_tx_csum,
 	.get_rx_csum	= ndis_get_rx_csum,
 	.set_tx_csum	= ndis_set_tx_csum,
 	.set_rx_csum	= ndis_set_rx_csum,
 	.get_sg		= ndis_get_sg,
 	.set_sg		= ndis_set_sg,
+#endif
 };
 
 static int notifier_event(struct notifier_block *notifier, unsigned long event,
--- a/driver/ndis.c	2011/10/04 15:31:37	3085
+++ b/driver/ndis.c	2012/03/26 17:00:31	3107
@@ -2654,9 +2654,15 @@
 	(ULONG *idle, ULONG *kernel_user, ULONG *index)
 {
 	int cpu = smp_processor_id();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+	*idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
+	*kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
+		kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
+#else
 	*idle = kstat_cpu(cpu).cpustat.idle;
 	*kernel_user = kstat_cpu(cpu).cpustat.system +
 		kstat_cpu(cpu).cpustat.user;
+#endif
 	*index = cpu;
 }