298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

r8152: fix build under kernel >= 4.19.10 or kernel >= 4.14.217 (#6965)

Browse Source 
Fixes: 1024f0ec23 ("r8152: update to 2.15 (#6900)")
Fixes: #6946

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
CN_SZTL 2021-06-12 01:57:31 +08:00 committed by GitHub
parent e2535799fb
commit 7883a5d2e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lean/r8152/Makefile
View File

@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=r8152 PKG_NAME:=r8152
PKG_VERSION:=2.15 PKG_VERSION:=2.15
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/1715173329/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/1715173329/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)?
@ -19,6 +19,8 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-linux-$(PKG_VERSION)
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org> PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define KernelPackage/usb-net-rtl8152-vendor define KernelPackage/usb-net-rtl8152-vendor

26
package/lean/r8152/patches/010-compat-skb_mark_not_on_list-was-backported-since-ker.patch Normal file
View File

@ -0,0 +1,26 @@
From b61b90b9aea30b944fc51b891dab3ab5eb30980c Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
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 <cnsztl@immortalwrt.org>
---
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) */