[arch-commits] Commit in r8168/trunk (0001-linux-5.6.patch PKGBUILD)

[Christian Hesse]

    Date: Thursday, April 2, 2020 @ 07:19:52
  Author: eworm
Revision: 609358

upgpkg: r8168 8.048.00-24

fix for linux >= 5.6

Added:
  r8168/trunk/0001-linux-5.6.patch
Modified:
  r8168/trunk/PKGBUILD

----------------------+
 0001-linux-5.6.patch |   71 +++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD             |   14 +++++++--
 2 files changed, 82 insertions(+), 3 deletions(-)

Added: 0001-linux-5.6.patch
===================================================================
--- 0001-linux-5.6.patch	                        (rev 0)
+++ 0001-linux-5.6.patch	2020-04-02 07:19:52 UTC (rev 609358)
@@ -0,0 +1,71 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index 0df6041..557823e 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev);
+ static void rtl8168_hw_start(struct net_device *dev);
+ static int rtl8168_close(struct net_device *dev);
+ static void rtl8168_set_rx_mode(struct net_device *dev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) 
++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu);
++#else
+ static void rtl8168_tx_timeout(struct net_device *dev);
++#endif
+ static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
+ static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);
+ static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
+@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file)
+ 
+         return single_open(file, show, dev);
+ }
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++static const struct proc_ops rtl8168_proc_ops = {
++        .proc_open           = rtl8168_proc_open,
++        .proc_read           = seq_read,
++        .proc_lseek          = seq_lseek,
++        .proc_release        = single_release,
++};
++#else
+ static const struct file_operations rtl8168_proc_fops = {
+         .open           = rtl8168_proc_open,
+         .read           = seq_read,
+@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = {
+         .release        = single_release,
+ };
+ #endif
++#endif
+ 
+ /*
+  * Table of proc files we need to create.
+@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev)
+                 tp->proc_dir = dir;
+                 proc_init_num++;
+ 
+-                for (f = rtl8168_proc_files; f->name[0]; f++) {
+-                        if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
+-                                              &rtl8168_proc_fops, f->show)) {
++     for (f = rtl8168_proc_files; f->name[0]; f++) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
++                                              &rtl8168_proc_ops, f->show)) 
++#else        
++         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
++                                              &rtl8168_proc_fops, f->show))
++#endif
++         {
+                                 printk("Unable to initialize "
+                                        "/proc/net/%s/%s/%s\n",
+                                        MODULENAME, dev->name, f->name);
+@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work)
+ }
+ 
+ static void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
++#else
+ rtl8168_tx_timeout(struct net_device *dev)
++#endif
+ {
+         struct rtl8168_private *tp = netdev_priv(dev);
+         unsigned long flags;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-02 07:14:55 UTC (rev 609357)
+++ PKGBUILD	2020-04-02 07:19:52 UTC (rev 609358)
@@ -4,15 +4,23 @@
 
 pkgname=r8168
 pkgver=8.048.00
-pkgrel=23
+pkgrel=24
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('x86_64')
 makedepends=('linux-headers')
-source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('0aacba20d985ba5e67e21bdad89a099e102f7bef3027adb647ffbb80b01ac8d0')
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+        0001-linux-5.6.patch)
+sha256sums=('0aacba20d985ba5e67e21bdad89a099e102f7bef3027adb647ffbb80b01ac8d0'
+            '7d0c468036a6acd83d056d6c243b3ace8be34bf3d633aa24bf54b9c3595f8a0d')
 
+prepare() {
+	cd "$pkgname-$pkgver"
+
+	patch -Np1 < ../0001-linux-5.6.patch
+}
+
 build() {
 	cd "$pkgname-$pkgver"
 	# avoid using the Makefile directly -- it doesn't understand