Request 5058 (accepted)

Overview

Request 5058 (accepted)

- Add patch 83b957b4.patch to get it build for kernel 5.6

Created by bitstreamout over 5 years ago
In state accepted
Package maintainer: bitstreamout

Submit r8168

Submit package home:bitstreamout:Essentials / r8168 to package Essentials / r8168

r8168.changes Changed

r8168.spec Changed

83b957b4.patch Added

@@ -0,0 +1,97 @@
+From 83b957b43d320da29476c6782be55df1bfb62d94 Mon Sep 17 00:00:00 2001
+From: petehg <pherworth@gmail.com>
+Date: Sun, 1 Mar 2020 09:38:25 +0000
+Subject: [PATCH] added patch for kernel-5.6
+
+---
+ src/r8168_n.c | 33 +++++++++++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 6 deletions(-)
+
+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);
+@@ -25881,7 +25899,6 @@ rtl8168_init_one(struct pci_dev *pdev,
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
+         SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops);
+ #endif
+-
+         dev->watchdog_timeo = RTL8168_TX_TIMEOUT;
+         dev->irq = pdev->irq;
+         dev->base_addr = (unsigned long) ioaddr;
+@@ -27817,7 +27834,7 @@ static void rtl8168_reset_task(struct work_struct *work)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+         rtl8168_rx_interrupt(dev, tp, &budget);
+ #else
+-        rtl8168_rx_interrupt(dev, tp, budget);
++        rtl8168_rx_interrupt(dev, tp, budget);      
+ #endif  //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 
+         spin_lock_irqsave(&tp->lock, flags);
+@@ -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;

Build Results
RPM Lint

Refresh

Comments for request 5058 0

Request History

bitstreamout created request over 5 years ago

- Add patch 83b957b4.patch to get it build for kernel 5.6

olh accepted request over 5 years ago