[openwrt/openwrt] kernel: r8126: update to v10.014.01

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 5 06:43:38 PST 2024


noltari pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/7763c5aabc422f62ae4a7559b52ba30551283520

commit 7763c5aabc422f62ae4a7559b52ba30551283520
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Tue Nov 5 00:33:02 2024 +0100

    kernel: r8126: update to v10.014.01
    
    Changelog: https://github.com/openwrt/rtl8126/compare/10.013.00...10.014.01
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
    (cherry picked from commit 562b2c22fff363f060e72c9018d243981b7d6447)
---
 package/kernel/r8126/Makefile                      |  6 ++---
 .../r8126/patches/001-r8126.h-use-BIT_ULL.patch    | 21 -----------------
 .../patches/100-r8126_rss-silence-rxnfc-log.patch  | 27 ----------------------
 ...00-r8126-print-link-speed-and-duplex-mode.patch | 10 ++++----
 4 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/package/kernel/r8126/Makefile b/package/kernel/r8126/Makefile
index c269cdcadc..a8f60f9dbb 100644
--- a/package/kernel/r8126/Makefile
+++ b/package/kernel/r8126/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=r8126
-PKG_VERSION:=10.013.00
-PKG_RELEASE:=4
+PKG_VERSION:=10.014.01
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/openwrt/rtl8126/releases/download/$(PKG_VERSION)
-PKG_HASH:=b41bda6ff3bbb7d9bc5b81c5c21355f031587d3a3a5862abcd4d766e942272e7
+PKG_HASH:=dbb10a7abd0972e4abd1b89ea4eb22fc55d6c1dc2f711b5acf4a3bc376275e21
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPLv2
diff --git a/package/kernel/r8126/patches/001-r8126.h-use-BIT_ULL.patch b/package/kernel/r8126/patches/001-r8126.h-use-BIT_ULL.patch
deleted file mode 100644
index cfbf31fcbb..0000000000
--- a/package/kernel/r8126/patches/001-r8126.h-use-BIT_ULL.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9649df50a239d1379cc8d9febd4854a0c7ca0731 Mon Sep 17 00:00:00 2001
-From: Mieczyslaw Nalewaj <namiltd at poczta.onet.pl>
-Date: Sat, 10 Aug 2024 17:42:44 +0200
-Subject: [PATCH] r8126.h: use BIT_ULL
-
-Fixes compilation on 32 bit systems.
----
- src/r8126.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/r8126.h
-+++ b/src/r8126.h
-@@ -678,7 +678,7 @@ This is free software, and you are welco
- #ifndef ADVERTISED_2500baseX_Full
- #define ADVERTISED_2500baseX_Full  0x8000
- #endif
--#define RTK_ADVERTISED_5000baseX_Full  BIT(48)
-+#define RTK_ADVERTISED_5000baseX_Full  BIT_ULL(48)
- 
- #define RTK_ADVERTISE_2500FULL  0x80
- #define RTK_ADVERTISE_5000FULL  0x100
diff --git a/package/kernel/r8126/patches/100-r8126_rss-silence-rxnfc-log.patch b/package/kernel/r8126/patches/100-r8126_rss-silence-rxnfc-log.patch
deleted file mode 100644
index d06406004c..0000000000
--- a/package/kernel/r8126/patches/100-r8126_rss-silence-rxnfc-log.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cd20cf48c0ec2a01fd9f512e25218a6ac8131794 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari at gmail.com>
-Date: Sat, 17 Aug 2024 22:07:23 +0200
-Subject: [PATCH] r8126_rss: silence rxnfc log
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This log is noisy and useless, just ignore it.
-
-Signed-off-by: Chukun Pan <amadeus at jmu.edu.cn>
-Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
----
- src/r8126_rss.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/r8126_rss.c
-+++ b/src/r8126_rss.c
-@@ -91,7 +91,7 @@ int rtl8126_get_rxnfc(struct net_device
-         struct rtl8126_private *tp = netdev_priv(dev);
-         int ret = -EOPNOTSUPP;
- 
--        netif_info(tp, drv, tp->dev, "rss get rxnfc\n");
-+        netif_dbg(tp, drv, tp->dev, "rss get rxnfc\n");
- 
-         if (!(dev->features & NETIF_F_RXHASH))
-                 return ret;
diff --git a/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch b/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch
index 308d2494b3..27b3d626c1 100644
--- a/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch
+++ b/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch
@@ -18,7 +18,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/src/r8126.h
 +++ b/src/r8126.h
-@@ -1561,6 +1561,8 @@ enum RTL8126_register_content {
+@@ -1740,6 +1740,8 @@ enum RTL8126_register_content {
          LinkStatus = 0x02,
          FullDup = 0x01,
  
@@ -37,7 +37,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/delay.h>
-@@ -4740,6 +4741,40 @@ rtl8126_link_down_patch(struct net_devic
+@@ -4744,6 +4745,40 @@ rtl8126_link_down_patch(struct net_devic
  #endif
  }
  
@@ -76,10 +76,10 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 +}
 +
  static void
- _rtl8126_check_link_status(struct net_device *dev)
+ _rtl8126_check_link_status(struct net_device *dev, unsigned int link_state)
  {
-@@ -4748,11 +4783,18 @@ _rtl8126_check_link_status(struct net_de
-         if (tp->link_ok(dev)) {
+@@ -4756,11 +4791,18 @@ _rtl8126_check_link_status(struct net_de
+         if (link_state == R8126_LINK_STATE_ON) {
                  rtl8126_link_on_patch(dev);
  
 -                if (netif_msg_ifup(tp))




More information about the lede-commits mailing list