commit 3936e7820eae4fb7cfb779a14e9323a426861c19
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 25 22:43:54 2014 +0200
- up to 5.2.9.4
igb.spec | 8 +++-----
linux-3.15.patch | 15 ---------------
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/igb.spec b/igb.spec
index b1825d1..2f6f59a 100644
--- a/igb.spec
+++ b/igb.spec
@@ -21,18 +21,17 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 3
+%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.2.5
+Version: 5.2.9.4
Release: %{rel}@%{_kernel_ver_str}
License: GPL v2
Group: Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: 7d7430f5a7151d39db038f4a75baa3b9
-Patch0: linux-3.15.patch
+# Source0-md5: b59b8d5ae7d8f53f3481004051fb7b87
URL: http://sourceforge.net/projects/e1000/
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
BuildRequires: rpm-build-macros >= 1.678
@@ -98,7 +97,6 @@ EOF\
%prep
%setup -q -n %{pname}-%{version}
-%patch0 -p1
cat > src/Makefile <<'EOF'
obj-m := igb.o
diff --git a/linux-3.15.patch b/linux-3.15.patch
deleted file mode 100644
index a515d4a..0000000
--- a/linux-3.15.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/igb_main.c
-+++ b/src/igb_main.c
-@@ -7366,7 +7366,12 @@ static inline void igb_rx_hash(struct igb_ring *ring,
- struct sk_buff *skb)
- {
- if (netdev_ring(ring)->features & NETIF_F_RXHASH)
-+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
- skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
-+#else
-+ skb_set_hash(skb, le32_to_cpu(rx_desc->wb.lower.hi_dword.rss),
-+ PKT_HASH_TYPE_L3);
-+#endif
- }
-
- #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/3936e7820eae4fb7cfb779a14e9323a426861c19
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
