gentoo auto-resync : 04:12:2022 - 21:03:51

3 files changed, 4 insertions, 78 deletions

diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index f4344d144200..e107282b0c2c 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,8 +1,7 @@
-AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900
 AUX r8168-8.050.02-5.18-fix.patch 2340 BLAKE2B d85b0d826b58bad42999309d81bd2a7a5202f81dfe516d32c0a7857d63394c70e5e9f66dcdfa03f8f05dce525204a225c6fa1c73dbd6a0cc2dae7a3995be120f SHA512 952660cd26f2c14e21b45bb0fa88012f980f7999b1f33849a295bc757063f25c2b5911f155305d4cc0d671b503acfc315901d584a83c78c47aeb76ee8301f3d7
 AUX r8168-8.050.03-5.19-fix.patch 849 BLAKE2B 1913abf46a1b0fa22587f64f5c81e87414e3bbf8d4fd392ce8eafe1405ef6499abf98cee4f26866216d781b6c0e7773dbd5867d4fe49038df3af001a4d81e826 SHA512 fe5977cfd0608a2335c96316568ef20ac4e6ae7913250f6fdfb885a1bf3f50a4de64c6102631650b5e1f4d752132086efa589a95e4cbb2086571fb3545847717
-DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6
-EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5
+DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca
 EBUILD r8168-8.050.03.ebuild 1163 BLAKE2B b2c551916ca8a3314b2be6e57c3705c85368824164d203e7a8f856aa416921720b68d77f16c3a5389c7d3b545b4458dc5b0e747891e59cab9042f4b0e74823f9 SHA512 86bffbb8d2772c8a56d54429dfe2b76be59ce6e05128b56c802d48fba6bd2980968103edf70cd699c4ba9b21ada0337ed1e84efb7ad3e0f74ee4d2c42714e2c1
+EBUILD r8168-8.051.02.ebuild 1062 BLAKE2B e2834e08258d151da481ffef3a26a9055c7652a2ad8bc7ffb26395655eee787b23e414a37a5f0cc8232b5d611055e01cf1597f9418d77beea527e5928e6aee3d SHA512 570271a2042db2336aa685f608b5b523ce5c372310ada7369c635b26cf39d87990e4ea9141aa75ef915ab9af7b0b17666f08cbe53a151f0241c7683512e0c43a
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
deleted file mode 100644
index 9e4e77615458..000000000000
--- a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-PDE_DATA has been replaced with pde_data
-netdev->dev_addr is now const and uses assignment helpers like eth_hw_addr_set
-
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=48eab83
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e
-
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -95,6 +95,10 @@
- #include <linux/seq_file.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#define PDE_DATA pde_data
-+#endif
-+
- #define FIRMWARE_8168D_1    "rtl_nic/rtl8168d-1.fw"
- #define FIRMWARE_8168D_2    "rtl_nic/rtl8168d-2.fw"
- #define FIRMWARE_8168E_1    "rtl_nic/rtl8168e-1.fw"
-@@ -563,7 +567,7 @@
- static void rtl8168_down(struct net_device *dev);
- 
- static int rtl8168_set_mac_address(struct net_device *dev, void *p);
--void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr);
-+void rtl8168_rar_set(struct rtl8168_private *tp, const uint8_t *addr);
- static void rtl8168_desc_addr_fill(struct rtl8168_private *);
- static void rtl8168_tx_desc_init(struct rtl8168_private *tp);
- static void rtl8168_rx_desc_init(struct rtl8168_private *tp);
-@@ -24129,9 +24133,17 @@
-         rtl8168_rar_set(tp, mac_addr);
- 
-         for (i = 0; i < MAC_ADDR_LEN; i++) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-                 dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
-                 tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
-+#else
-+                mac_addr[i] = RTL_R8(tp, MAC0 + i);
-+                tp->org_mac_addr[i] = mac_addr[i]; /* keep the original MAC address */
-+#endif
-         }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+        eth_hw_addr_set(dev, mac_addr);
-+#endif
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- #endif
-@@ -24159,9 +24171,11 @@
-                 return -EADDRNOTAVAIL;
- 
-         spin_lock_irqsave(&tp->lock, flags);
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
--
-+#else
-+        eth_hw_addr_set(dev, addr->sa_data);
-+#endif
-         rtl8168_rar_set(tp, dev->dev_addr);
- 
-         spin_unlock_irqrestore(&tp->lock, flags);
-@@ -24177,7 +24191,7 @@
-  *****************************************************************************/
- void
- rtl8168_rar_set(struct rtl8168_private *tp,
--                uint8_t *addr)
-+                const uint8_t *addr)
- {
-         uint32_t rar_low = 0;
-         uint32_t rar_high = 0;
diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild
index 6686979b10d9..4258fbb99cdb 100644
--- a/net-misc/r8168/r8168-8.049.02-r1.ebuild
+++ b/net-misc/r8168/r8168-8.051.02.ebuild
@@ -8,14 +8,14 @@ inherit linux-info linux-mod
 DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
 
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.19" from above link,
 # we need to mirror it to avoid users from needing to fill a captcha to
 # download
 SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
@@ -24,9 +24,6 @@ IUSE="use-firmware"
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-PATCHES=(
-	"${FILESDIR}/r8168-8.049.02-5.17-fix.patch"
-)
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"