- fix building with linux 3.15

- rel 2

diff --git a/ixgbe.spec b/ixgbe.spec
index 4d08a8fc6d55e9bf5e4dcb003055fa2ab14631ec..cdd5b73fbb9ac71b4d51dae82a2cd9b0d689ef42 100644 (file)
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -19,7 +19,7 @@ exit 1
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 %define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
 
-%define                rel     1
+%define                rel     2
 %define                pname   ixgbe
 Summary:       Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) 10 Gigabit
@@ -30,6 +30,7 @@ License:      GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5: dc635736d7e0ef5373131753f6609f38
+Patch0:                linux-3.15.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.678
@@ -94,6 +95,8 @@ EOF\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
+
 cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'
 obj-m := ixgbe.o

diff --git a/linux-3.15.patch b/linux-3.15.patch
new file mode 100644 (file)
index 0000000..75a4d42
--- /dev/null
+++ b/linux-3.15.patch
@@ -0,0 +1,12 @@
+--- ixgbe-3.21.2/src/kcompat.h~        2014-03-13 14:52:01.000000000 +0100
++++ ixgbe-3.21.2/src/kcompat.h 2014-07-12 11:34:56.647970376 +0200
+@@ -4087,4 +4087,9 @@
+ #define HAVE_NDO_SELECT_QUEUE_ACCEL_FALLBACK
+ #endif /* 3.14.0 */
+ 
++#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) )
++#define       u64_stats_fetch_begin_bh(a)     u64_stats_fetch_begin_irq(a)
++#define       u64_stats_fetch_retry_bh(a,b)   u64_stats_fetch_retry_irq(a,b)
++#endif
++
+ #endif /* _KCOMPAT_H_ */