rpms/ndiswrapper-kmod/F-15 ndiswrapper_3.3_kernel.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.77, 1.78
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16887
Modified Files:
ndiswrapper-kmod.spec
Added Files:
ndiswrapper_3.3_kernel.patch
Log Message:
* Thu Apr 12 2012 leigh scott <leigh123linux(a)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;
}
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-15/ndiswrapper-kmod.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ndiswrapper-kmod.spec 3 Apr 2012 17:28:05 -0000 1.77
+++ ndiswrapper-kmod.spec 12 Apr 2012 13:17:16 -0000 1.78
@@ -3,20 +3,21 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 1%{?_rc}%{?dist}.13
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?_rc}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
+Patch1: ndiswrapper_3.3_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -48,6 +49,7 @@
%setup -q -c -T -a 0 -n %{name}-%{version}%{?_rc}
(cd ndiswrapper-%{version} ;
%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|'
ndiswrapper-%{version}%{?_rc}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -75,6 +77,10 @@
%changelog
+* Thu Apr 12 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
+- patched for 3.3.0 kernel
+- fix release tag
+
* Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.13
- rebuild for updated kernel