[packages/r8168] - fix building with kernel 4.11 - rel 2
baggins
baggins at pld-linux.org
Wed May 10 00:53:19 CEST 2017
commit fe36121731152356594783fbea5ad25331ea7e0f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed May 10 00:53:04 2017 +0200
- fix building with kernel 4.11
- rel 2
linux-4.11.patch | 12 ++++++++++++
r8168.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/r8168.spec b/r8168.spec
index 876d74e..3b71fcd 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -4,7 +4,7 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 1
+%define rel 2
%define pname r8168
Summary: Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
Summary(pl.UTF-8): Linuksowy sterownik dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet
@@ -21,6 +21,7 @@ Source0: %{pname}-%{version}.tar.bz2
# Source0-md5: 2c583809d1ebf26ed7f5e775c83e68e0
Patch0: linux-4.5.patch
Patch1: linux-4.7.patch
+Patch2: linux-4.11.patch
BuildRequires: rpmbuild(macros) >= 1.701
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -74,6 +75,7 @@ Express Gigabit Ethernet.\
%setup -q -n %{pname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{expand:%build_kernel_packages}
diff --git a/linux-4.11.patch b/linux-4.11.patch
new file mode 100644
index 0000000..d77cbfe
--- /dev/null
+++ b/linux-4.11.patch
@@ -0,0 +1,12 @@
+--- r8168-8.042.00/src/r8168_n.c~ 2017-05-10 00:51:08.000000000 +0200
++++ r8168-8.042.00/src/r8168_n.c 2017-05-10 00:51:48.529625066 +0200
+@@ -25251,7 +25251,9 @@
+ if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
+ rtl8168_rx_skb(tp, skb);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
+ dev->last_rx = jiffies;
++#endif
+ RTLDEV->stats.rx_bytes += pkt_size;
+ RTLDEV->stats.rx_packets++;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/fe36121731152356594783fbea5ad25331ea7e0f
More information about the pld-cvs-commit
mailing list