From e1936de99bf3390287cc6d138a3e2c90a30c03eb Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 29 May 2021 00:59:06 +0800 Subject: [PATCH] r8152: Update to 2.15 Compile-tested-on: ramips (k4.14), rockchip (k4.19), x86 (k4.9) Runtime-tested-on: N/A Signed-off-by: Tianling Shen --- package/kernel/r8152/Makefile | 10 +++---- ...not_on_list-was-backported-since-ker.patch | 26 +++++++++++++++++++ .../100-add-LED-configuration-from-OF.patch | 10 +++---- 3 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch diff --git a/package/kernel/r8152/Makefile b/package/kernel/r8152/Makefile index 4a1a2d2525..61df595de8 100644 --- a/package/kernel/r8152/Makefile +++ b/package/kernel/r8152/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8152 -PKG_VERSION:=2.14 -PKG_RELEASE:=2 +PKG_VERSION:=2.15 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/wget/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=617c159eb72355c240be3f78971e5a01c9dffe5545a7ae76bb2bd87bb7a346ed +PKG_SOURCE_URL:=https://codeload.github.com/1715173329/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=dc8a06ed6ff397029c396a7e83476f1bf9541c4f927a4dbac8810c6ce014f8ca PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-linux-$(PKG_VERSION) -PKG_MAINTAINTER:=Tianling Shen +PKG_MAINTAINER:=Tianling Shen PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch b/package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch new file mode 100644 index 0000000000..fdbf842538 --- /dev/null +++ b/package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch @@ -0,0 +1,26 @@ +From b61b90b9aea30b944fc51b891dab3ab5eb30980c Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Sat, 29 May 2021 00:46:25 +0800 +Subject: [PATCH] compat: skb_mark_not_on_list was backported since kernel + 4.14.217 and 4.19.10 + +Signed-off-by: Tianling Shen +--- + compatibility.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/compatibility.h ++++ b/compatibility.h +@@ -548,10 +548,12 @@ + linkmode_clear_bit(nr, addr); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,217) || LINUX_VERSION_CODE < KERNEL_VERSION(4,19,10) + static inline void skb_mark_not_on_list(struct sk_buff *skb) + { + skb->next = NULL; + } ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,14,217) || LINUX_VERSION_CODE < KERNEL_VERSION(4,19,10) */ + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) */ + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0) */ + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) */ diff --git a/package/kernel/r8152/patches/100-add-LED-configuration-from-OF.patch b/package/kernel/r8152/patches/100-add-LED-configuration-from-OF.patch index 415a42a093..38d885d72d 100644 --- a/package/kernel/r8152/patches/100-add-LED-configuration-from-OF.patch +++ b/package/kernel/r8152/patches/100-add-LED-configuration-from-OF.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/r8152.c +++ b/r8152.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include #include #include @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -9736,6 +9737,22 @@ static void rtl_tally_reset(struct r8152 +@@ -9804,6 +9805,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -9797,6 +9814,8 @@ static void r8152b_init(struct r8152 *tp +@@ -9865,6 +9882,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -9937,6 +9956,8 @@ static void r8153_init(struct r8152 *tp) +@@ -10008,6 +10027,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -10026,6 +10047,8 @@ static void r8153b_init(struct r8152 *tp +@@ -10098,6 +10119,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */