diff --git a/package/lean/r8125/Makefile b/package/lean/r8125/Makefile index 3ad615cd3..a1ec478cb 100644 --- a/package/lean/r8125/Makefile +++ b/package/lean/r8125/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 -PKG_VERSION:=9.012.04-1 +PKG_VERSION:=9.013.02-2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)? -PKG_HASH:=470f02f1f3e9a12a0443128f5efd5e254e5e8e94487a5ab949724100fdca6ab4 +PKG_HASH:=eae10100680de13e8119602c50a1748b8a0669eccd61d9a4515b4c846deb3960 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only diff --git a/package/lean/r8125/patches/010-config.patch b/package/lean/r8125/patches/010-config.patch index fe4e7008d..a923f3efc 100644 --- a/package/lean/r8125/patches/010-config.patch +++ b/package/lean/r8125/patches/010-config.patch @@ -1,6 +1,6 @@ --- a/src/Makefile +++ b/src/Makefile -@@ -35,16 +35,16 @@ ENABLE_REALWOW_SUPPORT = n +@@ -35,7 +35,7 @@ ENABLE_REALWOW_SUPPORT = n ENABLE_DASH_SUPPORT = n ENABLE_DASH_PRINTER_SUPPORT = n CONFIG_DOWN_SPEED_100 = n @@ -9,10 +9,8 @@ ENABLE_S5WOL = y ENABLE_S5_KEEP_CURR_MAC = n ENABLE_EEE = y - ENABLE_S0_MAGIC_PACKET = n - ENABLE_TX_NO_CLOSE = y --ENABLE_MULTIPLE_TX_QUEUE = n -+ENABLE_MULTIPLE_TX_QUEUE = y +@@ -44,7 +44,7 @@ ENABLE_TX_NO_CLOSE = y + ENABLE_MULTIPLE_TX_QUEUE = y ENABLE_PTP_SUPPORT = n ENABLE_PTP_MASTER_MODE = n -ENABLE_RSS_SUPPORT = n diff --git a/package/lean/r8125/patches/011-ignore-rss-log.patch b/package/lean/r8125/patches/011-ignore-rss-log.patch new file mode 100644 index 000000000..05e9eee6b --- /dev/null +++ b/package/lean/r8125/patches/011-ignore-rss-log.patch @@ -0,0 +1,11 @@ +--- 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; diff --git a/package/lean/r8125/patches/020-fixes-build-werror.patch b/package/lean/r8125/patches/020-fixes-build-werror.patch deleted file mode 100644 index 640b50b1a..000000000 --- a/package/lean/r8125/patches/020-fixes-build-werror.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/r8125_rss.c -+++ b/src/r8125_rss.c -@@ -60,21 +60,21 @@ static int rtl8125_get_rss_hash_opts(str - switch (cmd->flow_type) { - case TCP_V4_FLOW: - cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; -- /* fallthrough */ -+ fallthrough; - case UDP_V4_FLOW: - if (tp->rss_flags & RTL_8125_RSS_FLAG_HASH_UDP_IPV4) - cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; -- /* fallthrough */ -+ fallthrough; - case IPV4_FLOW: - cmd->data |= RXH_IP_SRC | RXH_IP_DST; - break; - case TCP_V6_FLOW: - cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; -- /* fallthrough */ -+ fallthrough; - case UDP_V6_FLOW: - if (tp->rss_flags & RTL_8125_RSS_FLAG_HASH_UDP_IPV6) - cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; -- /* fallthrough */ -+ fallthrough; - case IPV6_FLOW: - cmd->data |= RXH_IP_SRC | RXH_IP_DST; - break; diff --git a/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch b/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch index 9b5d8d340..5fb3f941a 100644 --- a/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch +++ b/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch @@ -8,8 +8,8 @@ #include #include #include -@@ -14818,6 +14819,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri - } +@@ -13626,6 +13627,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri + tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4); } +static int @@ -32,9 +32,9 @@ static void rtl8125_init_software_variable(struct net_device *dev) { -@@ -15384,6 +15402,8 @@ rtl8125_init_software_variable(struct ne - if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) - tp->rtl8125_rx_config |= EnableRxDescV3; +@@ -14260,6 +14278,8 @@ rtl8125_init_software_variable(struct ne + else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) + tp->rtl8125_rx_config &= ~EnableRxDescV4_1; + rtl8125_led_configuration(tp); + diff --git a/package/lean/r8125/patches/040-add-devname-configuration-from-OF.patch b/package/lean/r8125/patches/040-add-devname-configuration-from-OF.patch index 8caea8b94..48f991749 100644 --- a/package/lean/r8125/patches/040-add-devname-configuration-from-OF.patch +++ b/package/lean/r8125/patches/040-add-devname-configuration-from-OF.patch @@ -1,6 +1,6 @@ --- a/src/r8125_n.c +++ b/src/r8125_n.c -@@ -14820,6 +14820,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri +@@ -13628,6 +13628,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri } static int @@ -24,9 +24,9 @@ rtl8125_led_configuration(struct rtl8125_private *tp) { u32 led_data; -@@ -15402,6 +15419,7 @@ rtl8125_init_software_variable(struct ne - if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) - tp->rtl8125_rx_config |= EnableRxDescV3; +@@ -14278,6 +14295,7 @@ rtl8125_init_software_variable(struct ne + else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) + tp->rtl8125_rx_config &= ~EnableRxDescV4_1; + rtl8125_devname_configuration(tp); rtl8125_led_configuration(tp); diff --git a/package/lean/r8125/patches/050-remove-rxnfc-print-message-info.patch b/package/lean/r8125/patches/050-remove-rxnfc-print-message-info.patch deleted file mode 100644 index 2d289cce1..000000000 --- a/package/lean/r8125/patches/050-remove-rxnfc-print-message-info.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8210ec212fb21dfd85af109af7d5ab39065fb16a Mon Sep 17 00:00:00 2001 -From: W_Y_CPP <383152993@qq.com> -Date: Mon, 8 Apr 2024 00:02:11 -0400 -Subject: [PATCH] remove print message info - ---- - src/r8125_rss.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/r8125_rss.c b/src/r8125_rss.c -index 8980ba7..a27eee2 100755 ---- a/src/r8125_rss.c -+++ b/src/r8125_rss.c -@@ -91,7 +91,7 @@ int rtl8125_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, - struct rtl8125_private *tp = netdev_priv(dev); - int ret = -EOPNOTSUPP; - -- netif_info(tp, drv, tp->dev, "rss get rxnfc\n"); -+ // netif_info(tp, drv, tp->dev, "rss get rxnfc\n"); - - if (!(dev->features & NETIF_F_RXHASH)) - return ret; --- -2.17.1 -