diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index b8b1a81437..e1530b9bb6 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 -PKG_VERSION:=9.010.01-2 +PKG_VERSION:=9.012.03-1 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:=b3e1b36578ba92a775049535e7434a9fc46710a721846c3706aca3d265db8cb9 +PKG_HASH:=7964aacf4a2873cbe4133aeca830bd0725f819ea286bab162026ff283510144f PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only diff --git a/package/kernel/r8125/patches/010-config.patch b/package/kernel/r8125/patches/010-config.patch index e7934c01c2..fe4e7008d7 100644 --- a/package/kernel/r8125/patches/010-config.patch +++ b/package/kernel/r8125/patches/010-config.patch @@ -19,4 +19,4 @@ +ENABLE_RSS_SUPPORT = y ENABLE_LIB_SUPPORT = n ENABLE_USE_FIRMWARE_FILE = n - DISABLE_PM_SUPPORT = n + DISABLE_WOL_SUPPORT = n diff --git a/package/kernel/r8125/patches/020-fixes-build-werror.patch b/package/kernel/r8125/patches/020-fixes-build-werror.patch new file mode 100644 index 0000000000..640b50b1a1 --- /dev/null +++ b/package/kernel/r8125/patches/020-fixes-build-werror.patch @@ -0,0 +1,28 @@ +--- 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/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch index 9f252b4458..9b5d8d3406 100644 --- a/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -11479,6 +11480,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri +@@ -14818,6 +14819,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri } } @@ -32,7 +32,7 @@ static void rtl8125_init_software_variable(struct net_device *dev) { -@@ -11957,6 +11975,8 @@ rtl8125_init_software_variable(struct ne +@@ -15384,6 +15402,8 @@ rtl8125_init_software_variable(struct ne if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) tp->rtl8125_rx_config |= EnableRxDescV3; diff --git a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch index 1cf87cb416..8caea8b94e 100644 --- a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch @@ -1,6 +1,6 @@ --- a/src/r8125_n.c +++ b/src/r8125_n.c -@@ -11481,6 +11481,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri +@@ -14820,6 +14820,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri } static int @@ -24,7 +24,7 @@ rtl8125_led_configuration(struct rtl8125_private *tp) { u32 led_data; -@@ -11975,6 +11992,7 @@ rtl8125_init_software_variable(struct ne +@@ -15402,6 +15419,7 @@ rtl8125_init_software_variable(struct ne if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) tp->rtl8125_rx_config |= EnableRxDescV3;