From e826a0c099f8932677a8bd1a108425e394cedb56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 25 Apr 2016 08:36:44 +0200 Subject: [PATCH] - up to 5.3.4.4 --- igb.spec | 8 +++----- linux-4.1.9.patch | 23 ----------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 linux-4.1.9.patch diff --git a/igb.spec b/igb.spec index cf79a8a..53b211d 100644 --- a/igb.spec +++ b/igb.spec @@ -6,18 +6,17 @@ %define _duplicate_files_terminate_build 0 -%define rel 2 +%define rel 1 %define pname igb Summary: Intel(R) PRO/1000 driver for Linux Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000 Name: %{pname}%{_alt_kernel} -Version: 5.3.3.2 +Version: 5.3.4.4 Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz -# Source0-md5: 2d753a0bd03c949ec08d68c27540044d -Patch0: linux-4.1.9.patch +# Source0-md5: 6c0d7dfdb161128da7c039fc83bbdba0 URL: http://sourceforge.net/projects/e1000/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2} BuildRequires: rpm-build-macros >= 1.701 @@ -81,7 +80,6 @@ EOF\ %prep %setup -q -n %{pname}-%{version} -%patch0 -p1 cat > src/Makefile <<'EOF' obj-m := igb.o diff --git a/linux-4.1.9.patch b/linux-4.1.9.patch deleted file mode 100644 index 474286e..0000000 --- a/linux-4.1.9.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- igb-5.3.3.2/src/kcompat.h~ 2015-09-11 23:47:20.000000000 +0200 -+++ igb-5.3.3.2/src/kcompat.h 2015-10-01 08:16:35.598629802 +0200 -@@ -4576,7 +4576,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 *page) - { -@@ -4589,8 +4589,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_ */ -- 2.43.0