gentoo auto-resync : 25:11:2024 - 03:02:44

4 files changed, 104 insertions, 3 deletions

diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 0a1590d70f23..de86a1986bc5 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,4 +1,7 @@
+AUX r8125-9.014.01-ptp-linux-6.11.patch 1795 BLAKE2B 1e9d588bd80e788f770d27b7bce7ee3aa4223bb9922e0c1a6dce06e04bc4e0278a78776d2f103c4f5d418f22c179fd0f9c66e3e130b624af169476476b41a9a4 SHA512 2b78c11ba870c1a1178e62dc94860c7f05f04fa8ddbf5ce84c7647f2facecfa7b34f402d83c330735d9792946deed6dbfb24290c37182b48337df8b6fb741997
 DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065
+DIST r8125-9.014.01.tar.bz2 111465 BLAKE2B ae09f27b617422e03484b10dfe7dcee14f58bc05650a80b654f9c02ba678424643575346312dae9ce327c309bf1afc575aec00e740a20fc4347c9c3bd00744ba SHA512 a12902e3e9dc34ae999080c1971a8ec9640d62f12a5648ddca0812d93d6c411c2c270e8c6de481fef23a982e8722e8515e5a3aa5c2d84cbdb4e6fa9da730c1e2
 EBUILD r8125-9.013.02-r1.ebuild 1068 BLAKE2B 00a9cb76cf0ded36aea65b401d2c393150758c1b976ae8068d4e25a88b38597bcf5f6ea2e6b549dcf68a7440d755d918fd036c424e08c7248be3810b79ede255 SHA512 1c7b46b2838d93dfcef80f7d913330d849029a9b96950fe9c2f5b49209665530e1c4bf011723ed33d88eeed76fa62b3a902b6a98c931b65f0781d53780727deb
 EBUILD r8125-9.013.02.ebuild 1229 BLAKE2B 8363f518e819fc89036de35cdb83325f11f5fa0db454836bb807d3897c977ecbd593a1abae0ba577d4cb2a0cda5c4bb04690e36b1e2fbaa242cbdb0b940054c6 SHA512 64ed8b67f27a9f214191ea65d3fffe09806dafeac05f2ae4a4efdcc7ba535811d95eba48fdb14ca6cb5ee31b81fe7603a9f5c8aeab9525f43f011609cb9ad049
-MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
+EBUILD r8125-9.014.01.ebuild 1124 BLAKE2B e3e9675d94da94821ebe56ad5dd5a1680d05aab1dc29cf5cf5be8c47bcf53ebda3d1f27fdaf0d92038dfb98f6df1abf03859aa13cd3911be0cdf8f2300d0f462 SHA512 bae7faa9d372dabdd31a34768381b0afc37f987ef87139ffc9f541ba586dabff71eb271f260b0264332d530e01d6e0884b0430dc9094d55ee81b90c245a00699
+MISC metadata.xml 814 BLAKE2B 88e06411e1406bf67610583eb0e548cc34730e3533c73f94081e1e603e4e7b2354faf92dbded045d0ae040336a0141b0aa50ebd31e3cb04484eb28d360cf8136 SHA512 876ace0417d1de347f786b434fb07a50e7b8b2852bdf2e24dc5f15797215530852e82b6ee9c2332d7723f1fe2e4cc2e9a8b9a373f5d4d4043670303e15cda085
diff --git a/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch b/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch
new file mode 100644
index 000000000000..294f8ba0ef4f
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch
@@ -0,0 +1,58 @@
+From 2c3c008b5ee7bc87fc8f146b787533c334fa3cf9 Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Sun, 24 Nov 2024 10:44:00 +0300
+Subject: [PATCH] Fixed missing changes for PTP on kernels >= 6.11
+
+---
+ src/r8125_ptp.h | 9 ++++++++-
+ src/r8125_ptp.c | 2 +-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/r8125_ptp.h b/src/r8125_ptp.h
+index b24136a..ca137b1 100644
+--- a/src/r8125_ptp.h
++++ b/src/r8125_ptp.h
+@@ -35,12 +35,19 @@
+ #ifndef _LINUX_rtl8125_PTP_H
+ #define _LINUX_rtl8125_PTP_H
+ 
++#include <linux/version.h>
+ #include <linux/ktime.h>
+ #include <linux/timecounter.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/ptp_clock_kernel.h>
+ #include <linux/ptp_classify.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
++#  define rtl_ethtool_ts_info   ethtool_ts_info
++#else
++#  define rtl_ethtool_ts_info   kernel_ethtool_ts_info
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,9,0) */
++
+ struct rtl8125_ptp_info {
+         s64 time_sec;
+         u32 time_ns;
+@@ -66,7 +73,7 @@ struct rtl8125_private;
+ struct RxDescV3;
+ 
+ int rtl8125_get_ts_info(struct net_device *netdev,
+-                        struct ethtool_ts_info *info);
++                        struct rtl_ethtool_ts_info *info);
+ 
+ void rtl8125_ptp_reset(struct rtl8125_private *tp);
+ void rtl8125_ptp_init(struct rtl8125_private *tp);
+diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
+index 812fced..02a6e41 100644
+--- a/src/r8125_ptp.c
++++ b/src/r8125_ptp.c
+@@ -304,7 +304,7 @@ static int rtl8125_phc_enable(struct ptp_clock_info *ptp,
+ }
+ 
+ int rtl8125_get_ts_info(struct net_device *netdev,
+-                        struct ethtool_ts_info *info)
++                        struct rtl_ethtool_ts_info *info)
+ {
+         struct rtl8125_private *tp = netdev_priv(netdev);
+ 
+-- 
+2.47.0.windows.2
diff --git a/net-misc/r8125/metadata.xml b/net-misc/r8125/metadata.xml
index a0cb8723713f..dfeac4126777 100644
--- a/net-misc/r8125/metadata.xml
+++ b/net-misc/r8125/metadata.xml
@@ -9,8 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Official Realtek r8125 vendor linux driver. The following cards are currently supported:
-RTL8125 RTL8125A RTL8125B(S)(G)</longdescription>
+	<longdescription>Official Realtek r8125 vendor linux driver. This driver supports NICs based on RTL8125 family.</longdescription>
 	<use>
 		<flag name="multi-tx-q">Enable Multiple Tx Queue (&#34;RSS&#34; for sending)</flag>
 		<flag name="ptp">Enable Precision Time Protocol support</flag>
diff --git a/net-misc/r8125/r8125-9.014.01.ebuild b/net-misc/r8125/r8125-9.014.01.ebuild
new file mode 100644
index 000000000000..982f68d8b27d
--- /dev/null
+++ b/net-misc/r8125/r8125-9.014.01.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 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/Download/List?cate_id=584"
+# Mirrored to avoid captcha
+SRC_URI="https://github.com/Karlson2k/r8125/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ptp-linux-6.11.patch"
+)
+
+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=y
+		ENABLE_RX_PACKET_FRAGMENT=y
+	)
+
+	linux-mod-r1_src_compile
+}