--- a/src/r8168_n.c 2022-06-18 09:02:35.532297609 +0900
+++ b/src/r8168_n.c 2022-06-18 09:14:15.082742367 +0900
@@ -3661,9 +3661,15 @@
txd->opts2 = 0;
while (1) {
memset(tmpAddr, pattern++, len - 14);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
pci_dma_sync_single_for_device(tp->pci_dev,
le64_to_cpu(mapping),
len, DMA_TO_DEVICE);
+#else
+ dma_sync_single_for_device(tp_to_dev(tp),
+ le64_to_cpu(mapping),
+ len, DMA_TO_DEVICE);
+#endif
txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) | AcceptMyPhys);
@@ -3689,7 +3695,11 @@
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);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+#else
+ dma_sync_single_for_device(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+#endif
if (i == 0) {
// dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
break;
@@ -24162,9 +24172,9 @@
spin_lock_irqsave(&tp->lock, flags);
- memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+ memcpy((void*)dev->dev_addr, addr->sa_data, dev->addr_len);
- rtl8168_rar_set(tp, dev->dev_addr);
+ rtl8168_rar_set(tp, (unsigned char*)dev->dev_addr);
spin_unlock_irqrestore(&tp->lock, flags);
@@ -25152,11 +25162,20 @@
if ((sizeof(dma_addr_t) > 4) &&
use_dac &&
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+#else
+ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
+ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+#endif
dev->features |= NETIF_F_HIGHDMA;
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+#else
+ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+#endif
if (rc < 0) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
if (netif_msg_probe(tp))
@@ -28649,7 +28668,7 @@
spin_lock_irqsave(&tp->lock, flags);
/* restore last modified mac address */
- rtl8168_rar_set(tp, dev->dev_addr);
+ rtl8168_rar_set(tp, (unsigned char*)dev->dev_addr);
spin_unlock_irqrestore(&tp->lock, flags);