Request 5573 (accepted)

Overview

Request 5573 (accepted)

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

Created by bitstreamout over 2 years ago
In state accepted
Package maintainer: bitstreamout

Submit r8168

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

r8168.changes Changed

r8168.spec Changed

r8168-kernel_5.18.patch Added

@@ -0,0 +1,39 @@
+---
+ src/r8168_n.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- src/r8168_n.c
++++ src/r8168_n.c	2022-05-03 21:58:06.034047041 +0000
+@@ -3707,7 +3707,7 @@ static void rtl8168_mac_loopback_test(st
+         txd->opts2 = 0;
+         while (1) {
+                 memset(tmpAddr, pattern++, len - 14);
+-                pci_dma_sync_single_for_device(tp->pci_dev,
++               dma_sync_single_for_device(&tp->pci_dev->dev,
+                                                le64_to_cpu(mapping),
+                                                len, DMA_TO_DEVICE);
+                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
+@@ -3735,7 +3735,7 @@ static void rtl8168_mac_loopback_test(st
+                 if (rx_len == len) {
+                         dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                         i = memcmp(skb->data, rx_skb->data, rx_len);
+-                        pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                         if (i == 0) {
+ //              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
+                                 break;
+@@ -26412,11 +26412,11 @@ rtl8168_init_board(struct pci_dev *pdev,
+ 
+         if ((sizeof(dma_addr_t) > 4) &&
+             use_dac &&
+-            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+-            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+                 dev->features |= NETIF_F_HIGHDMA;
+         } else {
+-                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))

Build Results
RPM Lint

Refresh

Comments for request 5573 0

Request History

bitstreamout created request over 2 years ago

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

bitstreamout accepted request over 2 years ago

Ditto