kernel: r8125: update to v9.014.01

Changelog: https://github.com/openwrt/rtl8125/compare/9.013.02...9.014.01

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2024-11-06 10:00:56 +01:00 committed by aiamadeus
parent a5eeb5700e
commit 7702e88e60
4 changed files with 9 additions and 35 deletions

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=r8125 PKG_NAME:=r8125
PKG_VERSION:=9.013.02 PKG_VERSION:=9.014.01
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/rtl8125/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/openwrt/rtl8125/releases/download/$(PKG_VERSION)
PKG_HASH:=d36410ee99c956f250d9cd08340d8c36567d190f420a8ee128ff6e51225aac0c PKG_HASH:=f006aa95501738ca55c522812c9d1b473ac781675f3ad88ce341a09316b8aa13
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

View File

@ -1,26 +0,0 @@
From cd20cf48c0ec2a01fd9f512e25218a6ac8131794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Sat, 17 Aug 2024 22:07:23 +0200
Subject: [PATCH] r8125_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: Álvaro Fernández Rojas <noltari@gmail.com>
---
src/r8125_rss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/r8125_rss.c
+++ b/src/r8125_rss.c
@@ -91,7 +91,7 @@ int rtl8125_get_rxnfc(struct net_device
struct rtl8125_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;

View File

@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/src/r8125.h --- a/src/r8125.h
+++ b/src/r8125.h +++ b/src/r8125.h
@@ -1563,6 +1563,8 @@ enum RTL8125_register_content { @@ -1672,6 +1672,8 @@ enum RTL8125_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>
@@ -5112,6 +5113,38 @@ rtl8125_link_down_patch(struct net_devic @@ -5116,6 +5117,38 @@ rtl8125_link_down_patch(struct net_devic
#endif #endif
} }
@ -73,10 +73,10 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+} +}
+ +
static void static void
_rtl8125_check_link_status(struct net_device *dev) _rtl8125_check_link_status(struct net_device *dev, unsigned int link_state)
{ {
@@ -5120,11 +5153,18 @@ _rtl8125_check_link_status(struct net_de @@ -5128,11 +5161,18 @@ _rtl8125_check_link_status(struct net_de
if (tp->link_ok(dev)) { if (link_state == R8125_LINK_STATE_ON) {
rtl8125_link_on_patch(dev); rtl8125_link_on_patch(dev);
- if (netif_msg_ifup(tp)) - if (netif_msg_ifup(tp))

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>
@@ -13667,6 +13668,22 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri @@ -14756,6 +14757,22 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri
} }
static void static void
@ -31,7 +31,7 @@
rtl8125_init_software_variable(struct net_device *dev) rtl8125_init_software_variable(struct net_device *dev)
{ {
struct rtl8125_private *tp = netdev_priv(dev); struct rtl8125_private *tp = netdev_priv(dev);
@@ -14300,6 +14317,7 @@ rtl8125_init_software_variable(struct ne @@ -15358,6 +15375,7 @@ rtl8125_init_software_variable(struct ne
else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4)
tp->rtl8125_rx_config &= ~EnableRxDescV4_1; tp->rtl8125_rx_config &= ~EnableRxDescV4_1;