From 216c04ff208f8bc8a268123a325a01c0a5d78004 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 21 Nov 2018 10:48:37 +0100 Subject: kernel: bump 4.14 to 4.14.82 Refreshed all patches. Compile-tested: cns3xxx, imx6, x86_64 Runtime-tested: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte --- .../320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch | 4 ++-- .../370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/backport-4.14') diff --git a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch index 5aae823ed7..7788dd1434 100644 --- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch +++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch @@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso if (nf_ct_is_expired(tmp)) { nf_ct_gc_expired(tmp); continue; -@@ -975,6 +978,18 @@ static bool gc_worker_can_early_drop(con +@@ -978,6 +981,18 @@ static bool gc_worker_can_early_drop(con return false; } @@ -76,7 +76,7 @@ Signed-off-by: Pablo Neira Ayuso static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1011,6 +1026,11 @@ static void gc_worker(struct work_struct +@@ -1014,6 +1029,11 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; 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 e68395c69e..e17b4b6204 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 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -978,18 +978,6 @@ static bool gc_worker_can_early_drop(con +@@ -981,18 +981,6 @@ static bool gc_worker_can_early_drop(con return false; } @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1026,10 +1014,8 @@ static void gc_worker(struct work_struct +@@ -1029,10 +1017,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; -- cgit v1.2.3