aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-09-04 19:54:35 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-13 17:08:17 +0200
commit51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a (patch)
tree3f9a794b168378c834694ac44047462738c8807d /target/linux/ath79
parent5fb4cb07e24655a45cc489d03f85ca813eb093a0 (diff)
downloadupstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.gz
upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.bz2
upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.zip
kernel: bump 5.4 to 5.4.144
Manually rebased: backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
index 55b198eb0c..d2200c8976 100644
--- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
@@ -171,7 +171,7 @@
#define UDP_CORK 1 /* Never send partially complete segments */
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -271,8 +271,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
+@@ -266,8 +266,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
switch (l3num) {
case NFPROTO_IPV4: