aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-08-04 07:55:58 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-08-08 17:57:34 +0200
commit3c0a26b43a2947d22cd907fde0e551273d56b121 (patch)
tree812acf604fea428604f7bc0df1e237e47018ca03 /target/linux/generic/backport-5.4
parent33e84e70ef6d0dd81ce0533f0c0495f9acc86ca9 (diff)
downloadupstream-3c0a26b43a2947d22cd907fde0e551273d56b121.tar.gz
upstream-3c0a26b43a2947d22cd907fde0e551273d56b121.tar.bz2
upstream-3c0a26b43a2947d22cd907fde0e551273d56b121.zip
kernel: bump 5.4 to 5.4.138
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.4')
-rw-r--r--target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
index 9bcb33b737..bf89af3840 100644
--- a/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
+++ b/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1207,18 +1207,6 @@ static bool gc_worker_can_early_drop(con
+@@ -1212,18 +1212,6 @@ static bool gc_worker_can_early_drop(con
return false;
}
@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
-@@ -1255,10 +1243,8 @@ static void gc_worker(struct work_struct
+@@ -1260,10 +1248,8 @@ static void gc_worker(struct work_struct
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;