kernel: bump 5.4 to 5.4.144

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch

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 bf89af3840f43cd09b95dcccbdff6e9b9a85dda1..373a15642944bf3961e21f5672500f568abcabfa 100644 (file)
--- 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))