commit: aa794c7213cd2c028fd48d097c518009765dd266 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Dec 4 12:58:59 2022 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Dec 4 14:49:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa794c72
net-misc/r8168: drop 8.049.02-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> net-misc/r8168/Manifest | 1 - net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch | 70 ---------------------- net-misc/r8168/r8168-8.049.02-r1.ebuild | 39 ------------ 3 files changed, 110 deletions(-) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index a1d893baeda4..0770f6988b67 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,3 +1,2 @@ -DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0 DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6 DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca 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.049.02-r1.ebuild deleted file mode 100644 index 6686979b10d9..000000000000 --- a/net-misc/r8168/r8168-8.049.02-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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, -# 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" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -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}" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs -}
