SPECS: sk98lin.spec - disable NAPI for kernels >= 2.6.24

[hawk]

Author: hawk                         Date: Wed May  7 23:12:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disable NAPI for kernels >= 2.6.24

---- Files affected:
SPECS:
   sk98lin.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/sk98lin.spec
diff -u SPECS/sk98lin.spec:1.1 SPECS/sk98lin.spec:1.2
--- SPECS/sk98lin.spec:1.1	Wed May  7 23:16:14 2008
+++ SPECS/sk98lin.spec	Thu May  8 01:12:29 2008
@@ -2,8 +2,7 @@
 #
 # TODO:
 #   - NAPI support is not ported and fails to build with
-#     kernels >= 2.6.24, it may be workarounded by disabling
-#     CONFIG_NETCONSOLE in kernel configuration
+#     kernels >= 2.6.24, workarounded by disabling NAPI
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
@@ -24,6 +23,7 @@
 Source0:	%{pname}-%{version}.tar.bz2
 # Source0-md5:	fff67831eb00a1687f67c11afa6292c6
 Patch0:		%{pname}-2.6.24.patch
+Patch1:		%{pname}-disable-napi.patch
 URL:		http://www.marvell.com/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -62,6 +62,9 @@
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%if "%{_kernel_ver}" >= "2.6.24"
+%patch1 -p1
+%endif
 
 %build
 %build_kernel_modules -m %{pname}
@@ -96,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008-05-07 23:12:29  hawk
+- disable NAPI for kernels >= 2.6.24
+
 Revision 1.1  2008-05-07 21:16:14  hawk
 - vendor driver for Marvell Yukon gigabit adapters, v10.50.1.3, repackaged
   from original tarball, only sources for kernel 2.6 were left, Makefile
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/sk98lin.spec?r1=1.1&r2=1.2&f=u