gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/r8125: fix for kernels 6.9-6.10

Browse Source 
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@narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/39442
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Karlson2k (Evgeny Grin)
2024-11-24 10:52:54 +03:00
committed by Joonas Niilola
parent d7acaad465
commit c93671f1ee
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.9.patch → net-misc/r8125/files/r8125-9.014.01-ptp-linux-6.11.patch
View File

@@ -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 <k2k@narod.ru>
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

2
net-misc/r8125/r8125-9.014.01.ebuild
View File

@@ -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"