diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-14 14:22:10 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-18 10:02:51 +0100 |
commit | a8cfef6c4584b1cf3e334c6d43a850b86d536d7d (patch) | |
tree | 347af5247bd62f2ea00b837a3a832ca7f8390155 /target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
parent | 79fc997e4875e1f1e48289ea719094e079745540 (diff) | |
download | upstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.tar.gz upstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.tar.bz2 upstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.zip |
kernel: bump 4.14 to 4.14.106
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/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-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index e17b4b6204..166b7219d5 100644 --- a/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.14/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 -@@ -981,18 +981,6 @@ static bool gc_worker_can_early_drop(con +@@ -997,18 +997,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); -@@ -1029,10 +1017,8 @@ static void gc_worker(struct work_struct +@@ -1045,10 +1033,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; |