diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch')
-rw-r--r-- | net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch new file mode 100644 index 000000000000..6da1bdae6b6a --- /dev/null +++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch @@ -0,0 +1,31 @@ +Added compatibility with Linux Kernel 5.18+. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/852311 + +diff --git a/src/r8125_n.c b/src/r8125_n.c + +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev, + + 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 // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) ++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && ++ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { ++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) + 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 // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) ++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); ++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) + if (rc < 0) { + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) + if (netif_msg_probe(tp)) + |