Overview

Request 4636 (accepted)

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

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

r8168.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Tue Nov 26 10:08:11 UTC 2019 - Werner Fink <werner@suse.de>
4
+
5
+- Update to new version 8.047.05
6
+- Motify patch r8168-kernel_version.patch to let it build with 5.4
7
+
8
+-------------------------------------------------------------------
9
 Thu Oct 24 05:49:20 UTC 2019 - Werner Fink <werner@suse.de>
10
 
11
 - (Re)add #!BuildIgnore: enough-build-resources 
12
r8168.spec Changed
10
 
1
@@ -18,7 +18,7 @@
2
 
3
 #!BuildIgnore: enough-build-resources
4
 Name:           r8168
5
-Version:        8.047.04
6
+Version:        8.047.05
7
 Release:        0
8
 Summary:        Device driver for RealTek Gigabit Ethernet controllers
9
 License:        GPL-2.0-or-later
10
r8168-kernel_version.patch Changed
33
 
1
@@ -1,10 +1,10 @@
2
 ---
3
  src/r8168.h   |    4 ++++
4
- src/r8168_n.c |    2 +-
5
- 2 files changed, 5 insertions(+), 1 deletion(-)
6
+ src/r8168_n.c |    4 ++--
7
+ 2 files changed, 6 insertions(+), 2 deletions(-)
8
 
9
 --- src/r8168.h
10
-+++ src/r8168.h    2018-01-10 14:30:36.443694357 +0000
11
++++ src/r8168.h    2019-11-26 10:20:59.180216676 +0000
12
 @@ -116,6 +116,10 @@ do { \
13
  } while (0)
14
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
15
@@ -17,7 +17,16 @@
16
  #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
17
  #define vlan_tx_tag_present skb_vlan_tag_present
18
 --- src/r8168_n.c
19
-+++ src/r8168_n.c  2018-01-10 14:33:25.348444039 +0000
20
++++ src/r8168_n.c  2019-11-26 10:22:05.270987378 +0000
21
+@@ -56,7 +56,7 @@
22
+ #include <linux/rtnetlink.h>
23
+ #include <linux/completion.h>
24
+ 
25
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
26
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0))
27
+ #include <linux/pci-aspm.h>
28
+ #endif
29
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
30
 @@ -28476,7 +28476,7 @@ process_pkt:
31
  
32
                          if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
33
r8168-8.047.04.tar.bz2/src/r8168.h -> r8168-8.047.05.tar.bz2/src/r8168.h Changed
10
 
1
@@ -327,7 +327,7 @@
2
 #define DASH_SUFFIX ""
3
 #endif
4
 
5
-#define RTL8168_VERSION "8.047.04" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
6
+#define RTL8168_VERSION "8.047.05" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
7
 #define MODULENAME "r8168"
8
 #define PFX MODULENAME ": "
9
 
10
r8168-8.047.04.tar.bz2/src/rtltool.c -> r8168-8.047.05.tar.bz2/src/rtltool.c Changed
10
 
1
@@ -97,7 +97,7 @@
2
                         return -EPERM;
3
 
4
                 spin_lock_irqsave(&tp->lock, flags);
5
-                my_cmd.data = rtl8168_mdio_read(tp, my_cmd.offset);
6
+                my_cmd.data = rtl8168_mdio_prot_read(tp, my_cmd.offset);
7
                 spin_unlock_irqrestore(&tp->lock, flags);
8
 
9
                 if (copy_to_user(ifr->ifr_data, &my_cmd, sizeof(my_cmd))) {
10
Refresh
Refresh
Request History
bitstreamout's avatar

bitstreamout created request over 5 years ago

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


Olaf Hering's avatar

olh accepted request over 5 years ago