diff options
| author | David Bauer <mail@david-bauer.net> | 2021-08-19 20:40:29 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2021-08-24 19:41:47 +0200 |
| commit | 378769b5551714ccaa821b481bfeecbf362f351e (patch) | |
| tree | 68fdc61b2ff165132b30bf325ab1ba13a8e6a5c1 /target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
| parent | 662401d903ae542e9868e572e318d5411ec756a7 (diff) | |
| download | upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.gz upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.bz2 upstream-378769b5551714ccaa821b481bfeecbf362f351e.zip | |
kernel: bump 5.4 to 5.4.142
Compile-tested: ath79-generic ipq40xx-generic
Run-tested: ipq40xx-generic
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | 4 |
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++; |