diff --git a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch index afbf0280a..38bcade15 100644 --- a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -1,4 +1,4 @@ -From 640973dcc794f43d99df7674209d9532711c49b4 Mon Sep 17 00:00:00 2001 +From 819a2761333e89e5b4dd480f1be44ad05d0a8cb3 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 18 Jul 2020 08:53:44 +0200 Subject: [PATCH 01/30] ipq807x: add the Qualcomm AX target support @@ -63,9 +63,9 @@ Signed-off-by: John Crispin .../ipq807x/patches/110-add-esmt-nand.patch | 37 + target/linux/ipq807x/patches/111-eap106.patch | 765 + target/linux/ipq807x/patches/112-pstore.patch | 147 + - .../ipq807x/patches/200-bpf_backport.patch | 44763 ++++++++++++++++ + .../ipq807x/patches/200-bpf_backport.patch | 44780 ++++++++++++++++ toolchain/kernel-headers/Makefile | 8 + - 60 files changed, 56667 insertions(+), 2 deletions(-) + 60 files changed, 56684 insertions(+), 2 deletions(-) create mode 100644 package/boot/uboot-envtools/files/ipq807x create mode 100644 target/linux/ipq807x/109-logspam.patch create mode 100644 target/linux/ipq807x/Makefile @@ -16570,10 +16570,10 @@ index 0000000000..dc3960306d + * The following routines scan a subtree and registers a device for diff --git a/target/linux/ipq807x/patches/200-bpf_backport.patch b/target/linux/ipq807x/patches/200-bpf_backport.patch new file mode 100644 -index 0000000000..915f965fa0 +index 0000000000..4357369c29 --- /dev/null +++ b/target/linux/ipq807x/patches/200-bpf_backport.patch -@@ -0,0 +1,44763 @@ +@@ -0,0 +1,44780 @@ +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -38,7 +38,7 @@ config ARM @@ -61337,6 +61337,23 @@ index 0000000000..915f965fa0 + } else { + if (unlikely((skb->protocol != htons(ETH_P_8021Q) && + skb->protocol != htons(ETH_P_8021AD)) || ++--- a/include/net/sock.h +++++ b/include/net/sock.h ++@@ -1484,6 +1484,14 @@ do { \ ++ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ ++ } while (0) ++ +++#ifdef CONFIG_LOCKDEP +++static inline bool lockdep_sock_is_held(struct sock *sk) +++{ +++ return lockdep_is_held(&sk->sk_lock) || +++ lockdep_is_held(&sk->sk_lock.slock); +++} +++#endif +++ ++ void lock_sock_nested(struct sock *sk, int subclass); ++ ++ static inline void lock_sock(struct sock *sk) diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index c33f26d46d..06236b5a47 100644 --- a/toolchain/kernel-headers/Makefile