From 9b72f9f7bbad99c6e732942c1cca3993e8348c27 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 16 Dec 2021 19:57:46 +0800 Subject: [PATCH] r8152: remove upstreamed patch Fixes: 15228d688ec30e ("r8152: Update to 2.15.20211119") Signed-off-by: Tianling Shen --- ...not_on_list-was-backported-since-ker.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch 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 deleted file mode 100644 index fdbf842538..0000000000 --- a/package/kernel/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) */