Overview

Request 5573 (accepted)

- Add upstream patch r8168-kernel_5.18.patch
* Make it build with kernel 5.18+

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

r8168.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Tue May 24 09:09:05 UTC 2022 - Dr. Werner Fink <werner@suse.de>
4
+
5
+- Add upstream patch r8168-kernel_5.18.patch
6
+  * Make it build with kernel 5.18+ 
7
+
8
+-------------------------------------------------------------------
9
 Tue May 10 10:30:35 UTC 2022 - Werner Fink <werner@suse.de>
10
 
11
 - Update to new version 8.050.00
12
r8168.spec Changed
17
 
1
@@ -29,6 +29,7 @@
2
 Source2:        Module.supported
3
 Patch0:         r8168-kernel_version.patch
4
 Patch1:         r8168-configuration.patch
5
+Patch2:         r8168-kernel_5.18.patch
6
 BuildRequires:  kernel-source
7
 BuildRequires:  kernel-syms
8
 BuildRequires:  libelf-devel
9
@@ -57,6 +58,7 @@
10
 %setup -q
11
 %patch0 -b .p0
12
 %patch1 -b .p1
13
+%patch2 -b .p2
14
 cp %{S:1} .
15
 cp %{S:2} .
16
 
17
r8168-kernel_5.18.patch Added
41
 
1
@@ -0,0 +1,39 @@
2
+---
3
+ src/r8168_n.c |   10 +++++-----
4
+ 1 file changed, 5 insertions(+), 5 deletions(-)
5
+
6
+--- src/r8168_n.c
7
++++ src/r8168_n.c  2022-05-03 21:58:06.034047041 +0000
8
+@@ -3707,7 +3707,7 @@ static void rtl8168_mac_loopback_test(st
9
+         txd->opts2 = 0;
10
+         while (1) {
11
+                 memset(tmpAddr, pattern++, len - 14);
12
+-                pci_dma_sync_single_for_device(tp->pci_dev,
13
++               dma_sync_single_for_device(&tp->pci_dev->dev,
14
+                                                le64_to_cpu(mapping),
15
+                                                len, DMA_TO_DEVICE);
16
+                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
17
+@@ -3735,7 +3735,7 @@ static void rtl8168_mac_loopback_test(st
18
+                 if (rx_len == len) {
19
+                         dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
20
+                         i = memcmp(skb->data, rx_skb->data, rx_len);
21
+-                        pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
22
++                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
23
+                         if (i == 0) {
24
+ //              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
25
+                                 break;
26
+@@ -26412,11 +26412,11 @@ rtl8168_init_board(struct pci_dev *pdev,
27
+ 
28
+         if ((sizeof(dma_addr_t) > 4) &&
29
+             use_dac &&
30
+-            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
31
+-            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
32
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
33
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
34
+                 dev->features |= NETIF_F_HIGHDMA;
35
+         } else {
36
+-                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
37
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
38
+                 if (rc < 0) {
39
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
40
+                         if (netif_msg_probe(tp))
41
Refresh


Request History
bitstreamout's avatar

bitstreamout created request almost 3 years ago

- Add upstream patch r8168-kernel_5.18.patch
* Make it build with kernel 5.18+


bitstreamout's avatar

bitstreamout accepted request almost 3 years ago

Ditto