[gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/files/, net-misc/r8168/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     13f43b73752f9cc8630655794307f7b7f77f97c5
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Tue Aug 15 14:34:57 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:31:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f43b73

net-misc/r8168: fixed build with kernel 6.4.10+

Bug: https://bugs.gentoo.org/912242

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/32323
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch | 17 +++++++++++++++++
 net-misc/r8168/r8168-8.051.02.ebuild                 |  1 +
 2 files changed, 18 insertions(+)

diff --git a/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch
new file mode 100644
index 000000000000..f10b86447971
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch
@@ -0,0 +1,17 @@
+Fixed build with kernels 6.4.10+
+Gentoo Bug: https://bugs.gentoo.org/912242
+See also:   https://github.com/mtorromeo/r8168/issues/54
+
+---
+--- a/src/r8168_n.c     2023-08-13 03:33:06.977422132 +0400
++++ b/src/r8168_n.c     2023-08-13 03:38:39.767005101 +0400
+@@ -81,6 +81,10 @@
+ #include <linux/mdio.h>
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10)
++#include <net/gso.h>
++#endif
++
+ #include <asm/io.h>
+ #include <asm/irq.h>

diff --git a/net-misc/r8168/r8168-8.051.02.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild
index 1b19ce47db5e..8f0c5b529c63 100644
--- a/net-misc/r8168/r8168-8.051.02.ebuild
+++ b/net-misc/r8168/r8168-8.051.02.ebuild
@@ -26,6 +26,7 @@ WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel dr
 
 PATCHES=(
 	"${FILESDIR}/${PN}-8.051.02-6.1-fix.patch"
+	"${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242
 )
 
 pkg_setup() {