Date: Wednesday, November 30, 2022 @ 11:01:30 Author: mtorromeo Revision: 1355400
upgpkg: r8168 8.051.02-1 Modified: r8168/trunk/PKGBUILD Deleted: r8168/trunk/linux518.patch r8168/trunk/linux519.patch ----------------+ PKGBUILD | 19 +++++-------------- linux518.patch | 52 ---------------------------------------------------- linux519.patch | 41 ----------------------------------------- 3 files changed, 5 insertions(+), 107 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-30 11:01:01 UTC (rev 1355399) +++ PKGBUILD 2022-11-30 11:01:30 UTC (rev 1355400) @@ -3,8 +3,8 @@ # Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > pkgname=r8168 -pkgver=8.050.03 -pkgrel=42 +pkgver=8.051.02 +pkgrel=1 pkgdesc="A kernel module for Realtek 8168 network cards" url="http://www.realtek.com.tw"; license=("GPL") @@ -11,20 +11,11 @@ arch=('x86_64') makedepends=('linux-headers') source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz - https://github.com/mtorromeo/r8168/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.asc - linux518.patch linux519.patch) -sha256sums=('76f9e7c26a8ade7b01dd34060f5b17d74387f15e9b6baa6dbba8c43634a31ce6' - 'SKIP' - 'd8d542770e504775600f686d03412a37cc32489872be7aeb388b5b08d9806096' - 'f5e08919764bc56d4f11b23fcb7cece663cae3f591992a0ca2be760e6890a9f8') + https://github.com/mtorromeo/r8168/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.asc) +sha256sums=('76f1c6f0b273d6a31bdb3e98c39a54f50a65766b99d485f9b4ddeda30dcd11d8' + 'SKIP') validpgpkeys=('0CADAACF70F64C654E131B3111675C743429DDEF') # Massimiliano Torromeo <[email protected]> -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../linux518.patch - patch -Np1 -i ../linux519.patch -} - build() { cd "$pkgname-$pkgver" # avoid using the Makefile directly -- it doesn't understand Deleted: linux518.patch =================================================================== --- linux518.patch 2022-11-30 11:01:01 UTC (rev 1355399) +++ linux518.patch 2022-11-30 11:01:30 UTC (rev 1355400) @@ -1,52 +0,0 @@ -diff -u -r r8168-8.050.00/src/r8168_n.c r8168-8.050.00-linux518/src/r8168_n.c ---- r8168-8.050.00/src/r8168_n.c 2022-05-06 09:48:25.000000000 +0000 -+++ r8168-8.050.00-linux518/src/r8168_n.c 2022-05-24 21:31:05.802807395 +0000 -@@ -3698,9 +3698,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); -@@ -3726,7 +3732,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; -@@ -26403,11 +26413,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)) Deleted: linux519.patch =================================================================== --- linux519.patch 2022-11-30 11:01:01 UTC (rev 1355399) +++ linux519.patch 2022-11-30 11:01:30 UTC (rev 1355400) @@ -1,41 +0,0 @@ -diff -u -r r8168-8.050.03/src/r8168_n.c r8168-8.050.03-linux519/src/r8168_n.c ---- r8168-8.050.03/src/r8168_n.c 2022-08-04 07:29:41.416222834 +0000 -+++ r8168-8.050.03-linux519/src/r8168_n.c 2022-08-04 07:38:13.202069962 +0000 -@@ -26898,6 +26898,10 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - if ((tp->mcfg == CFG_METHOD_1) || (tp->mcfg == CFG_METHOD_2) || (tp->mcfg == CFG_METHOD_3)) { - dev->hw_features &= ~NETIF_F_IPV6_CSUM; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) -+ netif_set_tso_max_size(dev, LSO_32K); -+ netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO_64K); -+#else - netif_set_gso_max_size(dev, LSO_32K); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) - dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K; -@@ -26905,6 +26909,7 @@ - dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT; - #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) -+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) - } else { - dev->hw_features |= NETIF_F_IPV6_CSUM; - dev->features |= NETIF_F_IPV6_CSUM; -@@ -26912,6 +26917,10 @@ - dev->hw_features |= NETIF_F_TSO6; - //dev->features |= NETIF_F_TSO6; - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) -+ netif_set_tso_max_size(dev, LSO_64K); -+ netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2); -+#else - netif_set_gso_max_size(dev, LSO_64K); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) - dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2; -@@ -26919,6 +26928,7 @@ - dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT; - #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) -+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) - } - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
