- up to 4.3.15

diff --git a/ixgbe.spec b/ixgbe.spec
index 873bceec255a69126807b3c548b5cef55dff6db7..3298cf4be28b7315fa00da4d792e0ff68a9cc39d 100644 (file)
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -9,13 +9,12 @@
 Summary:       Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) 10 Gigabit
 Name:          %{pname}%{_alt_kernel}
-Version:       4.1.5
+Version:       4.3.15
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: 8b7b97e6556eebd13ca12d5cff72d1e9
-Patch0:                linux-4.1.9.patch
+# Source0-md5: 417392e2b42b183cea61752b69166d0c
 URL:           http://sourceforge.net/projects/e1000/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.701
@@ -78,7 +77,6 @@ EOF\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'

diff --git a/linux-4.1.9.patch b/linux-4.1.9.patch
deleted file mode 100644 (file)
index ebf09fe..0000000
--- a/linux-4.1.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ixgbe-4.1.5/src/kcompat.h~ 2015-10-01 08:09:48.000000000 +0200
-+++ ixgbe-4.1.5/src/kcompat.h  2015-10-01 08:11:39.877868999 +0200
-@@ -4637,7 +4637,7 @@
- #define HAVE_NDO_BRIDGE_GETLINK_NLFLAGS
- #endif /* 4,1,0 */
- 
--#if ( LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) )
-+#if ( (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)) && !(LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,9)) )
- #if (!(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12,1,0)))
- static inline bool page_is_pfmemalloc(struct page __maybe_unused *page)
- {
-@@ -4650,8 +4650,10 @@
- #endif /* !SLES12sp1 */
- 
- #else
--#define HAVE_NDO_DFLT_BRIDGE_GETLINK_VLAN_SUPPORT
- #undef HAVE_STRUCT_PAGE_PFMEMALLOC
- #endif /* 4.2.0 */
-+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) )
-+#define HAVE_NDO_DFLT_BRIDGE_GETLINK_VLAN_SUPPORT
-+#endif /* 4.2.0 */
- 
- #endif /* _KCOMPAT_H_ */