[arch-commits] Commit in r8168/trunk (PKGBUILD linux-4.11.patch linux-4.15.patch)
Jan Steffens
heftig at archlinux.org
Mon Jan 29 11:40:24 UTC 2018
Date: Monday, January 29, 2018 @ 11:40:23
Author: heftig
Revision: 287759
8.045.08-25
Added:
r8168/trunk/linux-4.15.patch
Modified:
r8168/trunk/PKGBUILD
Deleted:
r8168/trunk/linux-4.11.patch
------------------+
PKGBUILD | 17 +++++++----
linux-4.11.patch | 14 ---------
linux-4.15.patch | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 93 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-29 11:38:10 UTC (rev 287758)
+++ PKGBUILD 2018-01-29 11:40:23 UTC (rev 287759)
@@ -5,7 +5,7 @@
pkgname=r8168
pkgver=8.045.08
-pkgrel=24
+pkgrel=25
pkgdesc="A kernel module for Realtek 8168 network cards"
url="http://www.realtek.com.tw"
license=("GPL")
@@ -12,9 +12,16 @@
arch=('x86_64')
depends=('glibc' 'linux')
makedepends=('linux-headers')
-source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31')
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+ linux-4.15.patch)
+sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31'
+ '6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7')
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../linux-4.15.patch
+}
+
build() {
_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
@@ -34,8 +41,8 @@
depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)")
cd "$pkgname-$pkgver"
- install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644 src/r8168.ko
- find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+ install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644 src/*.ko
+ find "$pkgdir" -name '*.ko' -exec xz {} +
echo "blacklist r8169" | \
install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf"
Deleted: linux-4.11.patch
===================================================================
--- linux-4.11.patch 2018-01-29 11:38:10 UTC (rev 287758)
+++ linux-4.11.patch 2018-01-29 11:40:23 UTC (rev 287759)
@@ -1,14 +0,0 @@
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index 3c5a7e7..e2026bb 100755
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -25732,7 +25732,9 @@ process_pkt:
- 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++;
- }
Added: linux-4.15.patch
===================================================================
--- linux-4.15.patch (rev 0)
+++ linux-4.15.patch 2018-01-29 11:40:23 UTC (rev 287759)
@@ -0,0 +1,81 @@
+diff -u -r r8168-8.045.08/src/r8168_n.c r8168-8.045.08-4.15/src/r8168_n.c
+--- r8168-8.045.08/src/r8168_n.c 2017-09-22 17:31:17.000000000 +0200
++++ r8168-8.045.08-4.15/src/r8168_n.c 2018-01-29 12:33:34.283394438 +0100
+@@ -407,8 +407,13 @@
+ static void rtl8168_sleep_rx_enable(struct net_device *dev);
+ static void rtl8168_dsm(struct net_device *dev, int dev_state);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void rtl8168_esd_timer(unsigned long __opaque);
+ static void rtl8168_link_timer(unsigned long __opaque);
++#else
++static void rtl8168_esd_timer(struct timer_list *timer_list);
++static void rtl8168_link_timer(struct timer_list *timer_list);
++#endif
+ static void rtl8168_tx_clear(struct rtl8168_private *tp);
+ static void rtl8168_rx_clear(struct rtl8168_private *tp);
+
+@@ -22964,7 +22969,11 @@
+ struct rtl8168_private *tp = netdev_priv(dev);
+ struct timer_list *timer = &tp->esd_timer;
+
+- setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++ setup_timer(timer, rtl8168_esd_timer, (unsigned long)tp);
++#else
++ timer_setup(timer, rtl8168_esd_timer, 0);
++#endif
+ mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT);
+ }
+
+@@ -22978,7 +22987,11 @@
+ struct rtl8168_private *tp = netdev_priv(dev);
+ struct timer_list *timer = &tp->link_timer;
+
+- setup_timer(timer, rtl8168_link_timer, (unsigned long)dev);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++ setup_timer(timer, rtl8168_link_timer, (unsigned long)tp);
++#else
++ timer_setup(timer, rtl8168_link_timer, 0);
++#endif
+ mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
+ }
+
+@@ -24717,10 +24730,16 @@
+ #define PCI_DEVICE_SERIAL_NUMBER (0x0164)
+
+ static void
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ rtl8168_esd_timer(unsigned long __opaque)
+ {
+- struct net_device *dev = (struct net_device *)__opaque;
+- struct rtl8168_private *tp = netdev_priv(dev);
++ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque;
++#else
++rtl8168_esd_timer(struct timer_list *timer_list)
++{
++ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, esd_timer);
++#endif
++ struct net_device *dev = tp->dev;
+ struct pci_dev *pdev = tp->pci_dev;
+ struct timer_list *timer = &tp->esd_timer;
+ unsigned long timeout = RTL8168_ESD_TIMEOUT;
+@@ -24856,10 +24875,16 @@
+ }
+
+ static void
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ rtl8168_link_timer(unsigned long __opaque)
+ {
+- struct net_device *dev = (struct net_device *)__opaque;
+- struct rtl8168_private *tp = netdev_priv(dev);
++ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque;
++#else
++rtl8168_link_timer(struct timer_list *timer_list)
++{
++ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, link_timer);
++#endif
++ struct net_device *dev = tp->dev;
+ struct timer_list *timer = &tp->link_timer;
+ unsigned long flags;
+
More information about the arch-commits
mailing list