- up to 3.22.3

diff --git a/ixgbe.spec b/ixgbe.spec
index cdd5b73fbb9ac71b4d51dae82a2cd9b0d689ef42..b3d5c9559115f1a25212b123b731ce909eccab52 100644 (file)
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -19,18 +19,17 @@ 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     2
+%define                rel     1
 %define                pname   ixgbe
 Summary:       Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) 10 Gigabit
 Name:          %{pname}%{_alt_kernel}
-Version:       3.21.2
+Version:       3.22.3
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: dc635736d7e0ef5373131753f6609f38
-Patch0:                linux-3.15.patch
+# Source0-md5: 6ba474edde8c1fa205ee3b9a3af0587f
 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
@@ -95,7 +94,6 @@ EOF\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'

diff --git a/linux-3.15.patch b/linux-3.15.patch
deleted file mode 100644 (file)
index 75a4d42..0000000
--- a/linux-3.15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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_ */