File r8168-kernel_version.patch of Package r8168

File r8168-kernel_version.patch of Package r8168 (Revision 17)

Currently displaying revision 17 , Show latest

---
 src/r8168.h   |    4 ++++
 src/r8168_n.c |   15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

--- src/r8168.h
+++ src/r8168.h	2021-01-25 09:25:12.615124741 +0000
@@ -116,6 +116,10 @@ do { \
 } while (0)
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
+#include <linux/sched/signal.h>
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
 #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
 #define vlan_tx_tag_present skb_vlan_tag_present
--- src/r8168_n.c
+++ src/r8168_n.c	2021-01-25 11:42:13.268115241 +0000
@@ -60,11 +60,16 @@
 #include <linux/rtnetlink.h>
 #include <linux/completion.h>
 
+#ifndef HAS_PCI_ASPM_H
+#define HAS_PCI_ASPM_H @ASPM@
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+#if HAS_PCI_ASPM_H
 #include <linux/pci-aspm.h>
 #endif
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
 #include <linux/prefetch.h>
 #endif
@@ -459,8 +464,12 @@ static void rtl8168_set_rx_mode(struct n
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
 static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
 #else
+#if !HAS_PCI_ASPM_H
+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
+#else
 static void rtl8168_tx_timeout(struct net_device *dev);
 #endif
+#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);
@@ -27948,8 +27957,12 @@ static void
 rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
 #else
 static void
+#if !HAS_PCI_ASPM_H
+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
+#else
 rtl8168_tx_timeout(struct net_device *dev)
 #endif
+#endif
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         unsigned long flags;
@@ -28655,7 +28668,7 @@ 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)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
                         dev->last_rx = jiffies;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
                         RTLDEV->stats.rx_bytes += pkt_size;