packages: ixgb/ixgb.spec, ixgb/ixgb-3.x.patch (NEW)=?UTF-8?Q?=20?=- add patch which shoul...

[lisu]

Author: lisu                         Date: Mon Feb 13 09:25:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add patch which should fix build with kernels 3.x

---- Files affected:
packages/ixgb:
   ixgb.spec (1.46 -> 1.47) , ixgb-3.x.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ixgb/ixgb.spec
diff -u packages/ixgb/ixgb.spec:1.46 packages/ixgb/ixgb.spec:1.47
--- packages/ixgb/ixgb.spec:1.46	Fri Feb 10 14:45:14 2012
+++ packages/ixgb/ixgb.spec	Mon Feb 13 10:25:48 2012
@@ -27,6 +27,7 @@
 Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5:	400ec2e8477cd43db253e5ed067b6ec4
 Patch0:		%{pname}-2.6.31.patch
+Patch1:		%{pname}-3.x.patch
 URL:		http://sourceforge.net/projects/e1000/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -62,6 +63,7 @@
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 cat > src/Makefile <<'EOF'
 obj-m := ixgb.o
 ixgb-objs := ixgb_main.o ixgb_hw.o ixgb_ee.o ixgb_param.o \
@@ -103,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2012/02/13 09:25:48  lisu
+- add patch which should fix build with kernels 3.x
+
 Revision 1.46  2012/02/10 13:45:14  lisu
 - rel 45
 

================================================================
Index: packages/ixgb/ixgb-3.x.patch
diff -u /dev/null packages/ixgb/ixgb-3.x.patch:1.1
--- /dev/null	Mon Feb 13 10:25:53 2012
+++ packages/ixgb/ixgb-3.x.patch	Mon Feb 13 10:25:48 2012
@@ -0,0 +1,34 @@
+--- ixgb-1.0.135/src/kcompat.h~	2008-01-16 21:00:10.000000000 +0100
++++ ixgb-1.0.135/src/kcompat.h	2012-02-13 10:19:59.572574518 +0100
+@@ -249,31 +249,6 @@
+ #define __read_mostly
+ #endif
+ 
+-#ifndef HAVE_NETIF_MSG
+-#define HAVE_NETIF_MSG 1
+-enum {
+-	NETIF_MSG_DRV		= 0x0001,
+-	NETIF_MSG_PROBE		= 0x0002,
+-	NETIF_MSG_LINK		= 0x0004,
+-	NETIF_MSG_TIMER		= 0x0008,
+-	NETIF_MSG_IFDOWN	= 0x0010,
+-	NETIF_MSG_IFUP		= 0x0020,
+-	NETIF_MSG_RX_ERR	= 0x0040,
+-	NETIF_MSG_TX_ERR	= 0x0080,
+-	NETIF_MSG_TX_QUEUED	= 0x0100,
+-	NETIF_MSG_INTR		= 0x0200,
+-	NETIF_MSG_TX_DONE	= 0x0400,
+-	NETIF_MSG_RX_STATUS	= 0x0800,
+-	NETIF_MSG_PKTDATA	= 0x1000,
+-	NETIF_MSG_HW		= 0x2000,
+-	NETIF_MSG_WOL		= 0x4000,
+-};
+-
+-#else
+-#define NETIF_MSG_HW	0x2000
+-#define NETIF_MSG_WOL	0x4000
+-#endif /* HAVE_NETIF_MSG */
+-
+ #ifndef MII_RESV1
+ #define MII_RESV1		0x17		/* Reserved...		*/
+ #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ixgb/ixgb.spec?r1=1.46&r2=1.47&f=u