diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-02 03:04:24 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-02 03:04:24 +0000 |
commit | 37a097af13d675b83911ac006ee9ee22d2163f9a (patch) | |
tree | 75294129093c3332ea0ba918643a3485b19550f6 /net-misc/r8125 | |
parent | aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 (diff) |
gentoo auto-resync : 02:11:2024 - 03:04:23
Diffstat (limited to 'net-misc/r8125')
-rw-r--r-- | net-misc/r8125/Manifest | 13 | ||||
-rw-r--r-- | net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch | 115 | ||||
-rw-r--r-- | net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch | 31 | ||||
-rw-r--r-- | net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch | 35 | ||||
-rw-r--r-- | net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch | 28 | ||||
-rw-r--r-- | net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch | 42 | ||||
-rw-r--r-- | net-misc/r8125/r8125-9.008.00-r1.ebuild | 45 | ||||
-rw-r--r-- | net-misc/r8125/r8125-9.009.01-r1.ebuild | 42 | ||||
-rw-r--r-- | net-misc/r8125/r8125-9.009.02-r1.ebuild | 40 | ||||
-rw-r--r-- | net-misc/r8125/r8125-9.011.01-r1.ebuild | 41 |
10 files changed, 0 insertions, 432 deletions
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest index 819785e1be59..49b7e3a8d2c5 100644 --- a/net-misc/r8125/Manifest +++ b/net-misc/r8125/Manifest @@ -1,17 +1,4 @@ -AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf -AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df -AUX r8125-9.009.01-linux-5.19.patch 1423 BLAKE2B 3b587a9261aa695cb9fc5e27032d23b15ff557aa1a467985448ce38b5e259d08d5690406b42d1dc068a82a748de0dff53607bf70ac5515d5c9ced0e7803ef4c0 SHA512 803c1f70d9af86f4ba28e72338c3fff2b2976bc9dac5ca2f733f11382afc0a2a4ac018560e70cbae8ecbd3928ea2a79b010630420f4af66475ce5c9bb3ef73a8 -AUX r8125-9.011.00-linux-6.1.patch 1141 BLAKE2B b018c01a34b1fdf6f3cdaebfeff0a2d3dee4ddc0e47cb4f7a2e1953af9a7d7354e161ab9687e5c927135cf945597a7d276fa5ee3f1a9c9f17ed5e294c7e123ab SHA512 0a23b8477cb6d1de10f6b5fedabc0d8de25963f038b425c3e17851cf5eb4bd7cd76c52625c27be71ff5129fc78cc2325cba6ec26acd5bbc9f0995eeec5970587 -AUX r8125-9.011.01-linux-6.2.patch 1523 BLAKE2B bb8d828940f2a94c11c73ff6bcabdc63a4dbd8426fdc6fc53c2416784248a93f8e071af1a25c2df57e5799031061664fcf5a1eea77812f62a222e4dbe9201e07 SHA512 03e7148d2d1363cca8bce1a7a35f28379d059a515e2107db59cf43623b4a7d67ec148bf3363c71c81f68cf667dfe2cbd1637210f06b031bfa21a8c65a2246daa -DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6 -DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d -DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe -DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2 DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065 -EBUILD r8125-9.008.00-r1.ebuild 1510 BLAKE2B 19d165085a3119a70df54e997300f88bdae903b6a34fbb558143a80ca3984732e37c647e7a3f5d0892ec267807d9fce2d40a8c377144ba59022de1475d50155d SHA512 702b348c97f4a2f41c7f2bb95b8319c13b1717b000344f741869e2ccee2a5470138fbc786329c856dc55a981d384e3f7b2ee78f3351f95cb327c880a664ced7d -EBUILD r8125-9.009.01-r1.ebuild 1296 BLAKE2B dd4c6e2b6a59186d9ac1341bcf14b125c8b28206b09586e6c10def5399e9adf7912cf97c924c66705acc060622e139bbce0859d3344c44dc674a60aae7c9d0e4 SHA512 86bea15e017ae59010d2f73853710b88804bedab4099858de352e19729d56f055dacf7c7a2ca54120be57632b681c8910871c717aad7f93fdb0ff63cfec1e777 -EBUILD r8125-9.009.02-r1.ebuild 1189 BLAKE2B 491fe1a223eeeaa66c9b844acbf05677715dc269acc2bb9468ccc40d01b5e0ccc8786d8ea377e92985f42d3df28ce5c7964902ef193b7a544b19fdd6c275bd50 SHA512 5fd5df7b14030b4cc137e6f0c71d34c4e4cdaee32bd65c8e3773cc5b188367dbcca58f30bcea8068d180b6daf35d0605f0de5cdb6af5c31060b31c1e5896269c -EBUILD r8125-9.011.01-r1.ebuild 1250 BLAKE2B 94ace00d1a39c2737f38d37ac4921999f94c2514058e4feca8b3e3fa247d81719e30a8a0586f1c5a329967398ad15f25fe801c94bacb76643be3e5877b647263 SHA512 1323f3bd461938900c768e302d08ac815ca4a492795e0332327a1a2b8ea0603e2940e749daad5762812e18027a8f6fa575f9e868f4d618f1affccaccdf2b1063 EBUILD r8125-9.013.02-r1.ebuild 1070 BLAKE2B 99ad6268f14300b2e40a692f60aa846718904220effdb2647feda6323d544e457a435057df88ddf3f2f4c62bbf58d3ccbfe70976bf7e50bf138ad2c7cd7cb73a SHA512 51206c39596c604da7447510de594be0642b413b1c80ca6811b364950a7bd12699fd93848f5566d70f64584f5fda7f1e86f362b3a19be7b9ba03c86f9d402e4c EBUILD r8125-9.013.02.ebuild 1229 BLAKE2B 8363f518e819fc89036de35cdb83325f11f5fa0db454836bb807d3897c977ecbd593a1abae0ba577d4cb2a0cda5c4bb04690e36b1e2fbaa242cbdb0b940054c6 SHA512 64ed8b67f27a9f214191ea65d3fffe09806dafeac05f2ae4a4efdcc7ba535811d95eba48fdb14ca6cb5ee31b81fe7603a9f5c8aeab9525f43f011609cb9ad049 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch deleted file mode 100644 index 1a4afdb31bea..000000000000 --- a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch +++ /dev/null @@ -1,115 +0,0 @@ -Added compatibility with Linux Kernel 5.17+. - -Author: Karlson2k (Evgeny Grin) -Gentoo bug: https://bugs.gentoo.org/839282 - -diff --git a/src/r8125_n.c b/src/r8125_n.c ---- a/src/r8125_n.c -+++ b/src/r8125_n.c -@@ -349,7 +349,7 @@ static int rtl8125_change_mtu(struct net_device *dev, int new_mtu); - static void rtl8125_down(struct net_device *dev); - - static int rtl8125_set_mac_address(struct net_device *dev, void *p); --static void rtl8125_rar_set(struct rtl8125_private *tp, uint8_t *addr); -+static void rtl8125_rar_set(struct rtl8125_private *tp, const uint8_t *addr); - static void rtl8125_desc_addr_fill(struct rtl8125_private *); - static void rtl8125_tx_desc_init(struct rtl8125_private *tp); - static void rtl8125_rx_desc_init(struct rtl8125_private *tp); -@@ -1750,7 +1750,13 @@ static void rtl8125_proc_module_init(void) - static int rtl8125_proc_open(struct inode *inode, struct file *file) - { - struct net_device *dev = proc_get_parent_data(inode); -- int (*show)(struct seq_file *, void *) = PDE_DATA(inode); -+ int (*show)(struct seq_file *, void *) = -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) -+ PDE_DATA(inode); -+#else -+ pde_data(inode); -+#endif -+ - - return single_open(file, show, dev); - } -@@ -5234,8 +5240,15 @@ rtl8125_set_ring_size(struct rtl8125_private *tp, u32 rx, u32 tx) - } - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) - static void rtl8125_get_ringparam(struct net_device *dev, - struct ethtool_ringparam *ring) -+#else -+static void rtl8125_get_ringparam(struct net_device* dev, -+ struct ethtool_ringparam* ring, -+ struct kernel_ethtool_ringparam* kernel_ring, -+ struct netlink_ext_ack* extack) -+#endif - { - struct rtl8125_private *tp = netdev_priv(dev); - -@@ -5245,8 +5258,15 @@ static void rtl8125_get_ringparam(struct net_device *dev, - ring->tx_pending = tp->tx_ring[0].num_tx_desc; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) - static int rtl8125_set_ringparam(struct net_device *dev, - struct ethtool_ringparam *ring) -+#else -+static int rtl8125_set_ringparam(struct net_device* dev, -+ struct ethtool_ringparam* ring, -+ struct kernel_ethtool_ringparam* kernel_ring, -+ struct netlink_ext_ack* extack) -+#endif - { - struct rtl8125_private *tp = netdev_priv(dev); - u32 new_rx_count, new_tx_count; -@@ -10889,6 +10909,9 @@ rtl8125_get_mac_address(struct net_device *dev) - struct rtl8125_private *tp = netdev_priv(dev); - int i; - u8 mac_addr[MAC_ADDR_LEN]; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) -+ u8 addr[ETH_ALEN]; -+#endif - - for (i = 0; i < MAC_ADDR_LEN; i++) - mac_addr[i] = RTL_R8(tp, MAC0 + i); -@@ -10916,9 +10939,17 @@ rtl8125_get_mac_address(struct net_device *dev) - rtl8125_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 -+ addr[i] = RTL_R8(tp, MAC0 + i); -+ tp->org_mac_addr[i] = addr[i]; /* keep the original MAC address */ -+#endif - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) -+ eth_hw_addr_set(dev, addr); -+#endif - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); - #endif -@@ -10944,7 +10975,11 @@ rtl8125_set_mac_address(struct net_device *dev, - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - -+#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 - - rtl8125_rar_set(tp, dev->dev_addr); - -@@ -10959,7 +10994,7 @@ rtl8125_set_mac_address(struct net_device *dev, - *****************************************************************************/ - void - rtl8125_rar_set(struct rtl8125_private *tp, -- uint8_t *addr) -+ const uint8_t *addr) - { - uint32_t rar_low = 0; - uint32_t rar_high = 0; - - 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 deleted file mode 100644 index 6da1bdae6b6a..000000000000 --- a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch +++ /dev/null @@ -1,31 +0,0 @@ -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)) - diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch deleted file mode 100644 index 8dc3f8749a11..000000000000 --- a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001 -From: Evgeny Grin <k2k@narod.ru> -Date: Mon, 3 Apr 2023 18:17:24 +0300 -Subject: [PATCH] Backport kernel 5.19 compatibility - ---- - src/r8125_n.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/r8125_n.c b/src/r8125_n.c -index 0bc5eec..e35e557 100644 ---- a/src/r8125_n.c -+++ b/src/r8125_n.c -@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev, - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6; - dev->features |= NETIF_F_IPV6_CSUM; -+#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 //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) - 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; -@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev, - 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) --- -2.40.0 - diff --git a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch deleted file mode 100644 index 343ab8ccf125..000000000000 --- a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cc2a99963b0039573464816f0cf86803381d5f11 Mon Sep 17 00:00:00 2001 -From: Evgeny Grin <k2k@narod.ru> -Date: Mon, 3 Apr 2023 16:46:39 +0300 -Subject: [PATCH] Fixed compatibility with Linux kernel versions >= 6.1 - ---- - src/r8125.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/r8125.h b/src/r8125.h -index 9eac0eb..4a29116 100644 ---- a/src/r8125.h -+++ b/src/r8125.h -@@ -676,7 +676,11 @@ typedef int *napi_budget; - typedef struct napi_struct *napi_ptr; - typedef int napi_budget; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) -+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight) -+#else // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) - #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) -+#endif // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) - #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) - #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) - #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; --- -2.40.0 - diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch deleted file mode 100644 index 26bb8620fbfd..000000000000 --- a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001 -From: Evgeny Grin <k2k@narod.ru> -Date: Tue, 27 Jun 2023 11:16:26 +0300 -Subject: [PATCH] Patched PTP functionality for Linux 6.2+ - ---- - src/r8125_ptp.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c -index 6010a18..b92fb18 100644 ---- a/src/r8125_ptp.c -+++ b/src/r8125_ptp.c -@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta) - return 0; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) -+static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) -+{ -+ return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm)); -+} -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ -+ - static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64) - { - struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info); -@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = { - .n_per_out = 0, - .n_pins = 0, - .pps = 1, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0) - .adjfreq = rtl8125_phc_adjfreq, -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ -+ .adjfine = rtl8125_phc_adjfine, -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ - .adjtime = rtl8125_phc_adjtime, - .gettime64 = rtl8125_phc_gettime, - .settime64 = rtl8125_phc_settime, --- -2.41.0.windows.1 - diff --git a/net-misc/r8125/r8125-9.008.00-r1.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild deleted file mode 100644 index 3779fd117278..000000000000 --- a/net-misc/r8125/r8125-9.008.00-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# The alternative direct URL for the file from the link above with description -# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+multi-tx-q ptp +rss use-firmware" - -PATCHES=( - "${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282 - "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311 - "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch" - "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 - "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 -) - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -src_compile() { - local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) - local modargs=( - # Build parameters - KERNELDIR="${KV_OUT_DIR}" - # Configuration settings - ENABLE_PTP_SUPPORT=$(usex ptp y n) - ENABLE_RSS_SUPPORT=$(usex rss y n) - ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) - ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) - ) - - linux-mod-r1_src_compile -} diff --git a/net-misc/r8125/r8125-9.009.01-r1.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild deleted file mode 100644 index 87bff3e7fb42..000000000000 --- a/net-misc/r8125/r8125-9.009.01-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+multi-tx-q ptp +rss use-firmware" - -PATCHES=( - "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311 - "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch" - "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 - "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 -) - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -src_compile() { - local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) - local modargs=( - # Build parameters - KERNELDIR="${KV_OUT_DIR}" - # Configuration settings - ENABLE_PTP_SUPPORT=$(usex ptp y n) - ENABLE_RSS_SUPPORT=$(usex rss y n) - ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) - ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) - ) - - linux-mod-r1_src_compile -} diff --git a/net-misc/r8125/r8125-9.009.02-r1.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild deleted file mode 100644 index 61bad3803fde..000000000000 --- a/net-misc/r8125/r8125-9.009.02-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+multi-tx-q ptp +rss use-firmware" - -PATCHES=( - "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 - "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 -) - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -src_compile() { - local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) - local modargs=( - # Build parameters - KERNELDIR="${KV_OUT_DIR}" - # Configuration settings - ENABLE_PTP_SUPPORT=$(usex ptp y n) - ENABLE_RSS_SUPPORT=$(usex rss y n) - ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) - ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) - ) - - linux-mod-r1_src_compile -} diff --git a/net-misc/r8125/r8125-9.011.01-r1.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild deleted file mode 100644 index e206e4deaa7c..000000000000 --- a/net-misc/r8125/r8125-9.011.01-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="+multi-tx-q ptp +rss use-firmware" - -PATCHES=( - "${FILESDIR}/${P}-linux-6.2.patch" # bug 908645 -) - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -src_compile() { - local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) - local modargs=( - # Build parameters - KERNELDIR="${KV_OUT_DIR}" - # Configuration settings - ENABLE_PTP_SUPPORT=$(usex ptp y n) - ENABLE_RSS_SUPPORT=$(usex rss y n) - ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) - ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) - ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP - ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP - ) - - linux-mod-r1_src_compile -} |