kernel: r8168: update to v8.055.00

Changelog: https://github.com/openwrt/rtl8168/compare/8.054.00...8.055.00

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
=?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= 2025-02-05 08:49:20 +01:00
parent 111e93f75d
commit a0dbcae1dd
5 changed files with 16 additions and 16 deletions

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=r8168 PKG_NAME:=r8168
PKG_VERSION:=8.054.00 PKG_VERSION:=8.055.00
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/openwrt/rtl8168/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/openwrt/rtl8168/releases/download/$(PKG_VERSION)
PKG_HASH:=5480120cf823e991e8cbd325118c1ec0c57d8f42760ba1a7334bd07d291d235d PKG_HASH:=61deb2a9cb7d6b08748ad51734b108da95d629712b64b204e2e6bd3f16d0a48f
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

View File

@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/src/r8168_n.c --- a/src/r8168_n.c
+++ b/src/r8168_n.c +++ b/src/r8168_n.c
@@ -1655,9 +1655,9 @@ static int proc_dump_rx_desc_2(struct se @@ -1668,9 +1668,9 @@ static int proc_dump_rx_desc_2(struct se
j, k); j, k);
for (i=0; i<(tp->RxDescLength/4); i++) { for (i=0; i<(tp->RxDescLength/4); i++) {
if (!(i % 4)) if (!(i % 4))

View File

@ -16,13 +16,11 @@ change to ethtool_keee from ethtool_eee
src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+) 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 --- a/src/r8168_n.c
+++ b/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 @@ -8103,7 +8103,11 @@ out:
} }
#else
static int static int
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata) +rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
@ -32,7 +30,7 @@ index ad63f42..3d67641 100755
{ {
struct rtl8168_private *tp = netdev_priv(net); struct rtl8168_private *tp = netdev_priv(net);
struct ethtool_eee *eee = &tp->eee; struct ethtool_eee *eee = &tp->eee;
@@ -7975,9 +7979,15 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) @@ -8137,9 +8141,15 @@ rtl_ethtool_get_eee(struct net_device *n
edata->eee_enabled = !!val; edata->eee_enabled = !!val;
edata->eee_active = !!(supported & adv & lp); edata->eee_active = !!(supported & adv & lp);
@ -48,7 +46,7 @@ index ad63f42..3d67641 100755
edata->tx_lpi_enabled = edata->eee_enabled; edata->tx_lpi_enabled = edata->eee_enabled;
edata->tx_lpi_timer = tx_lpi_timer; edata->tx_lpi_timer = tx_lpi_timer;
@@ -7985,11 +7995,19 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) @@ -8147,11 +8157,19 @@ rtl_ethtool_get_eee(struct net_device *n
} }
static int static int
@ -68,7 +66,7 @@ index ad63f42..3d67641 100755
int rc = 0; int rc = 0;
if (!rtl8168_support_eee(tp)) if (!rtl8168_support_eee(tp))
@@ -8013,6 +8031,18 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) @@ -8175,6 +8193,18 @@ rtl_ethtool_set_eee(struct net_device *n
} }
advertising = tp->advertising; advertising = tp->advertising;
@ -87,7 +85,7 @@ index ad63f42..3d67641 100755
if (!edata->advertised) { if (!edata->advertised) {
edata->advertised = advertising & eee->supported; edata->advertised = advertising & eee->supported;
} else if (edata->advertised & ~advertising) { } else if (edata->advertised & ~advertising) {
@@ -8021,15 +8051,29 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) @@ -8183,15 +8213,29 @@ rtl_ethtool_set_eee(struct net_device *n
rc = -EINVAL; rc = -EINVAL;
goto out; goto out;
} }

View File

@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/src/r8168.h --- a/src/r8168.h
+++ b/src/r8168.h +++ b/src/r8168.h
@@ -1468,6 +1468,8 @@ enum RTL8168_register_content { @@ -1480,6 +1480,8 @@ enum RTL8168_register_content {
LinkStatus = 0x02, LinkStatus = 0x02,
FullDup = 0x01, FullDup = 0x01,
@ -36,7 +36,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -5369,6 +5370,36 @@ rtl8168_link_down_patch(struct net_devic @@ -5396,6 +5397,38 @@ rtl8168_link_down_patch(struct net_devic
#endif #endif
} }
@ -65,6 +65,8 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+ speed = SPEED_100; + speed = SPEED_100;
+ else if (status & _10bps) + else if (status & _10bps)
+ speed = SPEED_10; + speed = SPEED_10;
+ else if (eee_giga_lite)
+ speed = SPEED_1000;
+ } + }
+ +
+ return speed; + return speed;
@ -73,7 +75,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
static void static void
rtl8168_check_link_status(struct net_device *dev) rtl8168_check_link_status(struct net_device *dev)
{ {
@@ -5388,11 +5419,18 @@ rtl8168_check_link_status(struct net_dev @@ -5415,11 +5448,18 @@ rtl8168_check_link_status(struct net_dev
if (link_status_on) { if (link_status_on) {
rtl8168_link_on_patch(dev); rtl8168_link_on_patch(dev);

View File

@ -8,7 +8,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -26098,6 +26099,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri @@ -26180,6 +26181,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri
} }
static void static void
@ -27,7 +27,7 @@
rtl8168_init_software_variable(struct net_device *dev) rtl8168_init_software_variable(struct net_device *dev)
{ {
struct rtl8168_private *tp = netdev_priv(dev); struct rtl8168_private *tp = netdev_priv(dev);
@@ -26792,6 +26805,7 @@ err1: @@ -26896,6 +26909,7 @@ err1:
if (tp->InitRxDescType == RX_DESC_RING_TYPE_2) if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
tp->RxDescLength = RX_DESC_LEN_TYPE_2; tp->RxDescLength = RX_DESC_LEN_TYPE_2;