[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: r8125: update to 9.012.03-1 r8152: update to 2.17.1-3 r8168: update to 8.052.01
xiaohong001 · Nov 7, 2023 · 3671ca0 · 3671ca0
2 parents ea3068f + bc4708a
commit 3671ca0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 51 deletions.
diff --git 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.010.01-2
+PKG_VERSION:=9.012.03-1
 PKG_RELEASE:=$(AUTORELEASE)
 
 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/lean/r8125/patches/010-config.patch b/package/lean/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/lean/r8125/patches/020-fixes-build-werror.patch b/package/lean/r8125/patches/020-fixes-build-werror.patch
@@ -1,6 +1,6 @@
 --- a/src/r8125_rss.c
 +++ b/src/r8125_rss.c
-@@ -57,21 +57,21 @@ static int rtl8125_get_rss_hash_opts(struct rtl8125_private *tp,
+@@ -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;

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
@@ -8,7 +8,7 @@
  #include <linux/if_vlan.h>
  #include <linux/crc32.h>
  #include <linux/interrupt.h>
-@@ -10416,6 +10417,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_private *tp)
+@@ -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)
  {
-@@ -10847,6 +10865,8 @@ 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;
 

diff --git a/package/lean/r8152/Makefile b/package/lean/r8152/Makefile
@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8152
-PKG_VERSION:=2.16.3-4
-PKG_RELEASE:=3
+PKG_VERSION:=2.17.1-3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8152-dkms/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=a80563c6abb05f4aeab5be9d63b0497859878c86e0f72c49dd527de2adec7b68
+PKG_HASH:=3e0486d412cb05ede0571b19fa6d402c1448b0220e5ae54aa5b11af918ad9a43
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Tianling Shen <[email protected]>

diff --git a/package/lean/r8168/Makefile b/package/lean/r8168/Makefile
@@ -7,13 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8168
-PKG_VERSION:=8.051.02
+PKG_VERSION:=8.052.01
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/BROBIRD/openwrt-r8168.git
-PKG_SOURCE_VERSION:=4f6cfe1ca12fb772deed57f1d2d1062af041ad07
-PKG_MIRROR_HASH:=6b149f5eb3b9e1dc50867a694984d253aa58d97dd5fbab30eb405d2d7b2be587
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/mtorromeo/r8168/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=cd8ee58a260e9b654080d39e3a42e3a3fb821041ee79e631b4647d84120aa999
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

diff --git a/package/lean/r8168/patches/020-5.19-support.patch b/package/lean/r8168/patches/020-5.19-support.patch
diff --git a/package/lean/r8168/patches/030-6.1-support.patch b/package/lean/r8168/patches/030-6.1-support.patch
diff --git a/...r8168-add-LED-configuration-from-OF.patch → ...s/100-add-LED-configuration-from-OF.patch b/...r8168-add-LED-configuration-from-OF.patch → ...s/100-add-LED-configuration-from-OF.patch
@@ -8,8 +8,8 @@
  #include <linux/if_vlan.h>
  #include <linux/crc32.h>
  #include <linux/interrupt.h>
-@@ -24769,6 +24770,22 @@ rtl8168_set_bios_setting(struct net_devi
-         }
+@@ -25852,6 +25853,22 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri
+         tp->imr_reg[3] = IntrMask3;
  }
 
 +static int rtl8168_led_configuration(struct rtl8168_private *tp)
@@ -31,9 +31,9 @@
  static void
  rtl8168_init_software_variable(struct net_device *dev)
  {
-@@ -25343,6 +25360,8 @@ rtl8168_init_software_variable(struct ne
-                 tp->NotWrMcuPatchCode = TRUE;
-         }
+@@ -26547,6 +26564,8 @@ err1:
+         if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
+                 tp->RxDescLength = RX_DESC_LEN_TYPE_2;
 
 +        rtl8168_led_configuration(tp);
 +