packages: e1000e/e1000e.spec, e1000e/e1000e-kernel.patch (NEW) - 2.6.33 bui...

[arekm]

Author: arekm                        Date: Sun Mar  7 18:03:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.6.33 build fix

---- Files affected:
packages/e1000e:
   e1000e.spec (1.71 -> 1.72) , e1000e-kernel.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/e1000e/e1000e.spec
diff -u packages/e1000e/e1000e.spec:1.71 packages/e1000e/e1000e.spec:1.72
--- packages/e1000e/e1000e.spec:1.71	Mon Feb 15 10:40:27 2010
+++ packages/e1000e/e1000e.spec	Sun Mar  7 19:03:27 2010
@@ -29,6 +29,7 @@
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5:	896aae3699f4268228da5c4e14ae8e2f
+Patch0:		%{pname}-kernel.patch
 URL:		http://dl.sourceforge.net/e1000/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -84,6 +85,7 @@
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 cat > src/Makefile <<'EOF'
 obj-m := e1000e.o
 e1000e-objs := netdev.o ethtool.o param.o e1000_82571.o e1000_ich8lan.o \
@@ -127,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2010/03/07 18:03:27  arekm
+- 2.6.33 build fix
+
 Revision 1.71  2010/02/15 09:40:27  arekm
 - release 3
 

================================================================
Index: packages/e1000e/e1000e-kernel.patch
diff -u /dev/null packages/e1000e/e1000e-kernel.patch:1.1
--- /dev/null	Sun Mar  7 19:03:35 2010
+++ packages/e1000e/e1000e-kernel.patch	Sun Mar  7 19:03:27 2010
@@ -0,0 +1,13 @@
+--- e1000e-1.1.2/src/ethtool.c~	2009-10-31 01:02:06.000000000 +0100
++++ e1000e-1.1.2/src/ethtool.c	2010-03-07 19:01:52.167295997 +0100
+@@ -2036,8 +2036,10 @@
+ 	.get_strings		= e1000_get_strings,
+ 	.phys_id		= e1000_phys_id,
+ 	.get_ethtool_stats	= e1000_get_ethtool_stats,
++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) )
+ 	.self_test_count	= e1000_get_self_test_count,
+ 	.get_stats_count	= e1000_get_stats_count,
++#endif
+ 	.get_coalesce		= e1000_get_coalesce,
+ 	.set_coalesce		= e1000_set_coalesce,
+ #ifdef NETIF_F_LRO
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e1000e/e1000e.spec?r1=1.71&r2=1.72&f=u