diff --git a/package/kernel/r8168/Makefile b/package/kernel/r8168/Makefile index 2604425de..0b846113d 100644 --- a/package/kernel/r8168/Makefile +++ b/package/kernel/r8168/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=r8168 -PKG_VERSION:=8.054.00 +PKG_VERSION:=8.055.00 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/openwrt/rtl8168/releases/download/$(PKG_VERSION) -PKG_HASH:=5480120cf823e991e8cbd325118c1ec0c57d8f42760ba1a7334bd07d291d235d +PKG_HASH:=61deb2a9cb7d6b08748ad51734b108da95d629712b64b204e2e6bd3f16d0a48f PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPLv2 diff --git a/package/kernel/r8168/patches/001-r8168_n-fix-proc_dump_rx_desc_2-on-32-bits.patch b/package/kernel/r8168/patches/001-r8168_n-fix-proc_dump_rx_desc_2-on-32-bits.patch index b53819a0c..bb00411e0 100644 --- a/package/kernel/r8168/patches/001-r8168_n-fix-proc_dump_rx_desc_2-on-32-bits.patch +++ b/package/kernel/r8168/patches/001-r8168_n-fix-proc_dump_rx_desc_2-on-32-bits.patch @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/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); for (i=0; i<(tp->RxDescLength/4); i++) { if (!(i % 4)) diff --git a/package/kernel/r8168/patches/100-linux-6.9-support.patch b/package/kernel/r8168/patches/100-linux-6.9-support.patch index 526805cd1..743a17c7e 100644 --- a/package/kernel/r8168/patches/100-linux-6.9-support.patch +++ b/package/kernel/r8168/patches/100-linux-6.9-support.patch @@ -16,13 +16,11 @@ change to ethtool_keee from ethtool_eee 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 +@@ -8103,7 +8103,11 @@ out: } - + #else static int +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) +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 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_active = !!(supported & adv & lp); @@ -48,7 +46,7 @@ index ad63f42..3d67641 100755 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) +@@ -8147,11 +8157,19 @@ rtl_ethtool_get_eee(struct net_device *n } static int @@ -68,7 +66,7 @@ index ad63f42..3d67641 100755 int rc = 0; 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; @@ -87,7 +85,7 @@ index ad63f42..3d67641 100755 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) +@@ -8183,15 +8213,29 @@ rtl_ethtool_set_eee(struct net_device *n rc = -EINVAL; goto out; } diff --git a/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch b/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch index e0402f475..a9f369a07 100644 --- a/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch +++ b/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch @@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/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, FullDup = 0x01, @@ -36,7 +36,7 @@ Signed-off-by: Álvaro Fernández Rojas #include #include #include -@@ -5369,6 +5370,36 @@ rtl8168_link_down_patch(struct net_devic +@@ -5396,6 +5397,38 @@ rtl8168_link_down_patch(struct net_devic #endif } @@ -65,6 +65,8 @@ Signed-off-by: Álvaro Fernández Rojas + speed = SPEED_100; + else if (status & _10bps) + speed = SPEED_10; ++ else if (eee_giga_lite) ++ speed = SPEED_1000; + } + + return speed; @@ -73,7 +75,7 @@ Signed-off-by: Álvaro Fernández Rojas static void 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) { rtl8168_link_on_patch(dev); diff --git a/package/kernel/r8168/patches/300-r8168-add-LED-configuration-from-OF.patch b/package/kernel/r8168/patches/300-r8168-add-LED-configuration-from-OF.patch index e50375a10..c8fe99edc 100644 --- a/package/kernel/r8168/patches/300-r8168-add-LED-configuration-from-OF.patch +++ b/package/kernel/r8168/patches/300-r8168-add-LED-configuration-from-OF.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -26098,6 +26099,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri +@@ -26180,6 +26181,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri } static void @@ -27,7 +27,7 @@ rtl8168_init_software_variable(struct net_device *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) tp->RxDescLength = RX_DESC_LEN_TYPE_2;