commit: c93671f1eeef8d82264e4229ffb221d95b0a4092 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Sun Nov 24 07:52:54 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Nov 24 08:16:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93671f1
net-misc/r8125: fix for kernels 6.9-6.10 Previously patch was incorrectly used for kernels >=6.9, while it should be used only for kernels >= 6.11 Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/39442 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...tp-linux-6.9.patch => r8125-9.014.01-ptp-linux-6.11.patch} | 11 +++++------ net-misc/r8125/r8125-9.014.01.ebuild | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.9.patch b/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch similarity index 86% rename from net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.9.patch rename to net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch index 775e8eef2f85..294f8ba0ef4f 100644 --- a/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.9.patch +++ b/net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch @@ -1,7 +1,7 @@ -From 0da7d93621651788505c3670890ee32c6619ddcd Mon Sep 17 00:00:00 2001 +From 2c3c008b5ee7bc87fc8f146b787533c334fa3cf9 Mon Sep 17 00:00:00 2001 From: Evgeny Grin <[email protected]> -Date: Sat, 23 Nov 2024 13:34:45 +0300 -Subject: [PATCH] Fixed missing changes for PTP on kernels >= 6.9 +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 ++++++++- @@ -9,7 +9,7 @@ Subject: [PATCH] Fixed missing changes for PTP on kernels >= 6.9 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/r8125_ptp.h b/src/r8125_ptp.h -index b24136a..50c0e50 100644 +index b24136a..ca137b1 100644 --- a/src/r8125_ptp.h +++ b/src/r8125_ptp.h @@ -35,12 +35,19 @@ @@ -23,7 +23,7 @@ index b24136a..50c0e50 100644 #include <linux/ptp_clock_kernel.h> #include <linux/ptp_classify.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,9,0) ++#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 @@ -56,4 +56,3 @@ index 812fced..02a6e41 100644 -- 2.47.0.windows.2 - diff --git a/net-misc/r8125/r8125-9.014.01.ebuild b/net-misc/r8125/r8125-9.014.01.ebuild index 85c5c355be29..982f68d8b27d 100644 --- a/net-misc/r8125/r8125-9.014.01.ebuild +++ b/net-misc/r8125/r8125-9.014.01.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="+multi-tx-q ptp +rss use-firmware" PATCHES=( - "${FILESDIR}/${P}-ptp-linux-6.9.patch" + "${FILESDIR}/${P}-ptp-linux-6.11.patch" ) CONFIG_CHECK="~!R8169"
