- up to 8.048.02

[packages/r8168.git] / kernel-5.6.patch

--- r8168-8.048.02/src/r8168_n.c~	2020-02-12 15:43:44.000000000 +0100
+++ r8168-8.048.02/src/r8168_n.c	2020-04-04 22:52:03.066746887 +0200
@@ -1616,12 +1616,21 @@
         return single_open(file, show, dev);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
 static const struct file_operations rtl8168_proc_fops = {
         .open           = rtl8168_proc_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
         .release        = single_release,
 };
+#else
+static const struct proc_ops rtl8168_proc_fops = {
+        .proc_open          = rtl8168_proc_open,
+        .proc_read          = seq_read,
+        .proc_lseek         = seq_lseek,
+        .proc_release       = single_release,
+};
+#endif
 #endif
 
 /*
--- r8168-8.048.02/src/r8168_n.c~	2020-04-04 22:53:42.000000000 +0200
+++ r8168-8.048.02/src/r8168_n.c	2020-04-04 22:58:05.263418678 +0200
@@ -456,7 +456,11 @@
 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);
+#else
+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
+#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);
@@ -27858,7 +27858,11 @@
 }
 
 static void
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
 rtl8168_tx_timeout(struct net_device *dev)
+#else
+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
+#endif
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         unsigned long flags;