Packman Build Service PMBS

Changes of Revision 18

r8168-kernel_version.patch Changed

@@ -1,7 +1,7 @@
 ---
  src/r8168.h   |    4 ++++
- src/r8168_n.c |    7 ++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ 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
@@ -17,14 +17,16 @@
  #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 09:57:05.218137078 +0000
-@@ -62,9 +62,14 @@
++++ src/r8168_n.c	2021-01-25 11:42:13.268115241 +0000
+@@ -60,11 +60,16 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
  
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
 +#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
@@ -33,7 +35,33 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
  #include <linux/prefetch.h>
  #endif
-@@ -28655,7 +28660,7 @@ process_pkt:
+@@ -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);