diff options
author | John Audia <graysky@archlinux.us> | 2021-09-04 19:54:35 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-13 17:08:17 +0200 |
commit | 51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a (patch) | |
tree | 3f9a794b168378c834694ac44047462738c8807d /target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
parent | 5fb4cb07e24655a45cc489d03f85ca813eb093a0 (diff) | |
download | upstream-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/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 | 8 |
1 files changed, 4 insertions, 4 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 bf89af3840..373a156429 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 -@@ -1212,18 +1212,6 @@ static bool gc_worker_can_early_drop(con +@@ -1207,18 +1207,6 @@ static bool gc_worker_can_early_drop(con return false; } @@ -39,11 +39,11 @@ 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); -@@ -1260,10 +1248,8 @@ static void gc_worker(struct work_struct + unsigned long end_time = jiffies + GC_SCAN_MAX_DURATION; +@@ -1250,10 +1238,8 @@ static void gc_worker(struct work_struct + tmp = nf_ct_tuplehash_to_ctrack(h); - scanned++; - if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) { - nf_ct_offload_timeout(tmp); + if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) |