Request 4636 (accepted)

Overview

Request 4636 (accepted)

- Update to new version 8.047.05
- Motify patch r8168-kernel_version.patch to let it build with 5.4

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

​x
 
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Nov 26 10:08:11 UTC 2019 - Werner Fink <werner@suse.de>
+
+- Update to new version 8.047.05
+- Motify patch r8168-kernel_version.patch to let it build with 5.4
+
+-------------------------------------------------------------------
 Thu Oct 24 05:49:20 UTC 2019 - Werner Fink <werner@suse.de>
 
 - (Re)add #!BuildIgnore: enough-build-resources 
​

r8168.spec Changed

 
@@ -18,7 +18,7 @@
 
 #!BuildIgnore: enough-build-resources
 Name:           r8168
-Version:        8.047.04
+Version:        8.047.05
 Release:        0
 Summary:        Device driver for RealTek Gigabit Ethernet controllers
 License:        GPL-2.0-or-later
​

r8168-kernel_version.patch Changed

@@ -1,10 +1,10 @@
 ---
  src/r8168.h   |    4 ++++
- src/r8168_n.c |    2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ src/r8168_n.c |    4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
 --- src/r8168.h
-+++ src/r8168.h	2018-01-10 14:30:36.443694357 +0000
++++ src/r8168.h	2019-11-26 10:20:59.180216676 +0000
 @@ -116,6 +116,10 @@ do { \
  } while (0)
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
@@ -17,7 +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	2018-01-10 14:33:25.348444039 +0000
++++ src/r8168_n.c	2019-11-26 10:22:05.270987378 +0000
+@@ -56,7 +56,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0))
+ #include <linux/pci-aspm.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
 @@ -28476,7 +28476,7 @@ process_pkt:
  
                          if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)

 
@@ -1,10 +1,10 @@
 ---
  src/r8168.h   |    4 ++++
- src/r8168_n.c |    2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ src/r8168_n.c |    4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
 --- src/r8168.h
-+++ src/r8168.h    2018-01-10 14:30:36.443694357 +0000
++++ src/r8168.h    2019-11-26 10:20:59.180216676 +0000
 @@ -116,6 +116,10 @@ do { \
  } while (0)
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
@@ -17,7 +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  2018-01-10 14:33:25.348444039 +0000
++++ src/r8168_n.c  2019-11-26 10:22:05.270987378 +0000
+@@ -56,7 +56,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0))
+ #include <linux/pci-aspm.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
 @@ -28476,7 +28476,7 @@ process_pkt:
  
                          if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
​

r8168-8.047.04.tar.bz2/src/r8168.h -> r8168-8.047.05.tar.bz2/src/r8168.h Changed

 
@@ -327,7 +327,7 @@
 #define DASH_SUFFIX ""
 #endif
 
-#define RTL8168_VERSION "8.047.04" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
+#define RTL8168_VERSION "8.047.05" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
 #define MODULENAME "r8168"
 #define PFX MODULENAME ": "
 
​

r8168-8.047.04.tar.bz2/src/rtltool.c -> r8168-8.047.05.tar.bz2/src/rtltool.c Changed

 
@@ -97,7 +97,7 @@
                         return -EPERM;
 
                 spin_lock_irqsave(&tp->lock, flags);
-                my_cmd.data = rtl8168_mdio_read(tp, my_cmd.offset);
+                my_cmd.data = rtl8168_mdio_prot_read(tp, my_cmd.offset);
                 spin_unlock_irqrestore(&tp->lock, flags);
 
                 if (copy_to_user(ifr->ifr_data, &my_cmd, sizeof(my_cmd))) {
​