diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 13:39:00 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:53:39 +0200 |
| commit | 5387bc9cbb9ed205f08766523a296f21dfa83b56 (patch) | |
| tree | 4e8822f417aac2dc8b9f8f4e805569705cb0b5a6 /target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
| parent | 1138e0f8878fe402697fd4b8aceacec39fc28a00 (diff) | |
| download | upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.tar.gz upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.tar.bz2 upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.zip | |
kernel: bump 4.14 to 4.14.111
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 166b7219d5..22fdebb3a8 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 -@@ -997,18 +997,6 @@ static bool gc_worker_can_early_drop(con +@@ -1005,18 +1005,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); -@@ -1045,10 +1033,8 @@ static void gc_worker(struct work_struct +@@ -1053,10 +1041,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; |