OSDN Git Service

Merge branch 'master' of github.com:immortalwrt/immortalwrt
authorZiMing Mo <msylgj@immortalwrt.org>
Wed, 4 May 2022 09:21:23 +0000 (17:21 +0800)
committerZiMing Mo <msylgj@immortalwrt.org>
Wed, 4 May 2022 09:21:23 +0000 (17:21 +0800)
package/kernel/r8168/Makefile
package/kernel/r8168/patches/001-r8168-add-LED-configuration-from-OF.patch
package/kernel/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch [deleted file]

index 15316c0..a68b74e 100644 (file)
@@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8168
-PKG_VERSION:=8.049.02
+PKG_VERSION:=8.050.00
 PKG_RELEASE:=$(AUTORELEAE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/BROBIRD/openwrt-r8168.git
-PKG_SOURCE_DATE:=2021-10-08
-PKG_SOURCE_VERSION:=2b969c15afe403a685fc7ee069620782241e3ad6
-PKG_MIRROR_HASH:=e4632c10d460f005eff76da8a183d7ff0c8819b0d099872589b7b06a9b8d9952
+PKG_SOURCE_DATE:=2022-05-03
+PKG_SOURCE_VERSION:=1c18465e76ed6872f001d08e2fe0c139fc80ef7e
+PKG_MIRROR_HASH:=5ca8242bd209079a5abac608a865f86e727cc8de15a460d7d78e611d0c443f15
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
index 096d271..fa71542 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/if_vlan.h>
  #include <linux/crc32.h>
  #include <linux/interrupt.h>
-@@ -23482,6 +23483,22 @@ rtl8168_set_bios_setting(struct net_devi
+@@ -24605,6 +24606,22 @@ rtl8168_set_bios_setting(struct net_devi
          }
  }
  
@@ -31,7 +31,7 @@
  static void
  rtl8168_init_software_variable(struct net_device *dev)
  {
-@@ -24000,6 +24017,8 @@ rtl8168_init_software_variable(struct ne
+@@ -25164,6 +25181,8 @@ rtl8168_init_software_variable(struct ne
                  tp->NotWrMcuPatchCode = TRUE;
          }
  
diff --git a/package/kernel/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch b/package/kernel/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch
deleted file mode 100644 (file)
index 1051944..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/r8168_n.c    2021-07-05 01:30:48.000000000 +0100
-+++ b/src/r8168_n.c    2022-02-02 09:13:11.165555448 +0000
-@@ -96,6 +96,10 @@
- #include <linux/seq_file.h>
- #endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-+#define PDE_DATA pde_data
-+#endif
-+
- #define FIRMWARE_8168D_1    "rtl_nic/rtl8168d-1.fw"
- #define FIRMWARE_8168D_2    "rtl_nic/rtl8168d-2.fw"
- #define FIRMWARE_8168E_1    "rtl_nic/rtl8168e-1.fw"
-@@ -524,6 +528,12 @@
- MODULE_VERSION(RTL8168_VERSION);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
-+static inline void dev_addr_mod(struct net_device *dev, unsigned int offset, const void *addr, size_t len) {
-+      memcpy(&dev->dev_addr[offset], addr, len);
-+}
-+#endif
-+
- static void rtl8168_sleep_rx_enable(struct net_device *dev);
- static void rtl8168_dsm(struct net_device *dev, int dev_state);
-@@ -24146,11 +24156,13 @@
-         }
-         rtl8168_rar_set(tp, mac_addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
-         for (i = 0; i < MAC_ADDR_LEN; i++) {
-                 dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
-                 tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
-         }
-+#endif
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- #endif
-@@ -24178,9 +24190,9 @@
-                 return -EADDRNOTAVAIL;
-         spin_lock_irqsave(&tp->lock, flags);
--
--        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+        dev_addr_mod(dev, 0, addr->sa_data, dev->addr_len);
-+        /* memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);*/
-         rtl8168_rar_set(tp, dev->dev_addr);