mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
net-misc/r8168: drop 8.051.02-r1, 8.054.00, 8.054.00-r1
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
parent
f2c64c07bc
commit
1153791a3a
@ -1,3 +1 @@
|
||||
DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca
|
||||
DIST r8168-8.054.00.tar.gz 170346 BLAKE2B d237f8158434b86f123ad54615b3b7079ee54e066baf80304d19c9fcec247ebafb348340a01260f15692341add349ae6daf0f2ac4ad7953f16f804861c3a4480 SHA512 31b64c39ab3d4b8077e3a9880e20fdbfeee99e5fc3e26327d27085c2f97862ffa33af5d5c0ff7624c1216fa9230282ed835600c17ad4a6de8a87f29661156bbf
|
||||
DIST r8168-8.055.00.tar.gz 170917 BLAKE2B fc29066debac6d45f279f65a13e9dc812d270ec779f900acdc24a47dc94efd4ce65fb1d34553ff520ff9384382108b8fa14153bba70dbe58ad0eb8da2e39d30e SHA512 fb004b9921b75d984e847c9ac41fba58924f868485110dc4a8bc01933ec503f8a405b258d1c25f0884b1670aa0be4f4f250e36a176f31b4023032dc1c93577bb
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 39dd0fd2e5dc45cd63113f33a9890e36c304916d Mon Sep 17 00:00:00 2001
|
||||
From: zu1k <i@zu1k.com>
|
||||
Date: Sat, 29 Oct 2022 21:57:39 +0800
|
||||
Subject: [PATCH] Adapted for Linux 6.1
|
||||
|
||||
---
|
||||
src/r8168.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/r8168.h b/src/r8168.h
|
||||
index 662974a..baf48c6 100755
|
||||
--- a/src/r8168.h
|
||||
+++ b/src/r8168.h
|
||||
@@ -561,7 +561,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(ndev, &priv->napi, function)
|
||||
+#else
|
||||
#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight)
|
||||
+#endif
|
||||
#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;
|
||||
@ -1,17 +0,0 @@
|
||||
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>
|
||||
@ -1,119 +0,0 @@
|
||||
From 94426e16197c244d03aad0434e3490acdaa830fe Mon Sep 17 00:00:00 2001
|
||||
From: Masato TOYOSHIMA <phoepsilonix@phoepsilonix.love>
|
||||
Date: Tue, 14 May 2024 14:52:58 +0900
|
||||
Subject: [PATCH] Linux 6.9 compat: change to ethtool_keee from ethtool_eee
|
||||
|
||||
linux/include/linux/ethtool.h
|
||||
|
||||
struct ethtool_ops
|
||||
int (*get_eee)(struct net_device *dev, struct ethtool_keee *eee);
|
||||
int (*set_eee)(struct net_device *dev, struct ethtool_keee *eee);
|
||||
|
||||
change to ethtool_keee from ethtool_eee
|
||||
rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
|
||||
rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
|
||||
---
|
||||
src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 44 insertions(+)
|
||||
|
||||
diff --git a/src/r8168_n.c b/src/r8168_n.c
|
||||
index ad63f42..3d67641 100755
|
||||
--- a/src/r8168_n.c
|
||||
+++ b/src/r8168_n.c
|
||||
@@ -7941,7 +7941,11 @@ rtl8168_device_lpi_t_to_ethtool_lpi_t(struct rtl8168_private *tp , u32 lpi_timer
|
||||
}
|
||||
|
||||
static int
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
|
||||
+#else
|
||||
rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
+#endif
|
||||
{
|
||||
struct rtl8168_private *tp = netdev_priv(net);
|
||||
struct ethtool_eee *eee = &tp->eee;
|
||||
@@ -7975,9 +7979,15 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
|
||||
edata->eee_enabled = !!val;
|
||||
edata->eee_active = !!(supported & adv & lp);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+ ethtool_convert_legacy_u32_to_link_mode(edata->supported, supported);
|
||||
+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
|
||||
+ ethtool_convert_legacy_u32_to_link_mode(edata->lp_advertised, lp);
|
||||
+#else
|
||||
edata->supported = supported;
|
||||
edata->advertised = adv;
|
||||
edata->lp_advertised = lp;
|
||||
+#endif
|
||||
edata->tx_lpi_enabled = edata->eee_enabled;
|
||||
edata->tx_lpi_timer = tx_lpi_timer;
|
||||
|
||||
@@ -7985,11 +7995,19 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
}
|
||||
|
||||
static int
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
|
||||
+#else
|
||||
rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
+#endif
|
||||
{
|
||||
struct rtl8168_private *tp = netdev_priv(net);
|
||||
struct ethtool_eee *eee = &tp->eee;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+ u32 advertising, adv;
|
||||
+#else
|
||||
u32 advertising;
|
||||
+#endif
|
||||
int rc = 0;
|
||||
|
||||
if (!rtl8168_support_eee(tp))
|
||||
@@ -8013,6 +8031,18 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
}
|
||||
|
||||
advertising = tp->advertising;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+ ethtool_convert_link_mode_to_legacy_u32(&adv, edata->advertised);
|
||||
+ if (linkmode_empty(edata->advertised)) {
|
||||
+ adv = advertising & eee->supported;
|
||||
+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
|
||||
+ } else if (!linkmode_empty(edata->advertised) & ~advertising) {
|
||||
+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",
|
||||
+ adv, advertising);
|
||||
+ rc = -EINVAL;
|
||||
+ goto out;
|
||||
+ }
|
||||
+#else
|
||||
if (!edata->advertised) {
|
||||
edata->advertised = advertising & eee->supported;
|
||||
} else if (edata->advertised & ~advertising) {
|
||||
@@ -8021,15 +8051,29 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
|
||||
rc = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+ if (!linkmode_empty(edata->advertised) & ~eee->supported) {
|
||||
+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
|
||||
+ adv, eee->supported);
|
||||
+ rc = -EINVAL;
|
||||
+ goto out;
|
||||
+ }
|
||||
+#else
|
||||
if (edata->advertised & ~eee->supported) {
|
||||
dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
|
||||
edata->advertised, eee->supported);
|
||||
rc = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
||||
+ ethtool_convert_link_mode_to_legacy_u32(&eee->advertised, edata->advertised);
|
||||
+#else
|
||||
eee->advertised = edata->advertised;
|
||||
+#endif
|
||||
eee->eee_enabled = edata->eee_enabled;
|
||||
|
||||
if (eee->eee_enabled)
|
||||
@ -1,37 +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="r8168 driver for Realtek 8111/8168 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="use-firmware"
|
||||
|
||||
CONFIG_CHECK="~!R8169"
|
||||
WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-6.1-fix.patch"
|
||||
"${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
|
||||
local modargs=(
|
||||
# Build parameters
|
||||
KERNELDIR="${KV_OUT_DIR}"
|
||||
# Configuration settings
|
||||
ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
|
||||
)
|
||||
|
||||
linux-mod-r1_src_compile
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit linux-mod-r1
|
||||
|
||||
DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
|
||||
HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584"
|
||||
SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="down-speed-100 +eee hw-acceleration multi-tx-q rss s5-keep-mac +wol-s5 use-firmware +wol"
|
||||
|
||||
CONFIG_CHECK="~!R8169"
|
||||
WARNING_R8169="CONFIG_R8169 is enabled. ${P} 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}"
|
||||
# Code build options
|
||||
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)
|
||||
CONFIG_DOWN_SPEED_100=$(usex down-speed-100 y n)
|
||||
# Driver defaults
|
||||
CONFIG_SOC_LAN=$(usex hw-acceleration y n)
|
||||
ENABLE_EEE=$(usex eee y n)
|
||||
DISABLE_WOL_SUPPORT=$(usex wol n y)
|
||||
ENABLE_S5WOL=$(usex wol-s5 y n)
|
||||
ENABLE_S5_KEEP_CURR_MAC=$(usex s5-keep-mac y n)
|
||||
)
|
||||
|
||||
linux-mod-r1_src_compile
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit linux-mod-r1
|
||||
|
||||
DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
|
||||
HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584"
|
||||
SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE="use-firmware"
|
||||
|
||||
CONFIG_CHECK="~!R8169"
|
||||
WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-8.053.00-kernel-6.9.patch )
|
||||
|
||||
src_compile() {
|
||||
local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
|
||||
local modargs=(
|
||||
# Build parameters
|
||||
KERNELDIR="${KV_OUT_DIR}"
|
||||
# Configuration settings
|
||||
ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
|
||||
)
|
||||
|
||||
linux-mod-r1_src_compile
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user