diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-18 10:17:50 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-19 14:59:03 +0100 |
commit | 7533087565005ecb41954790d4991cb7c32bb066 (patch) | |
tree | f39e52f4da17c9952bb311296cde166c2bdacbb2 /target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
parent | d6aea46a50d976745df30b550ed76357363e7ca8 (diff) | |
download | upstream-7533087565005ecb41954790d4991cb7c32bb066.tar.gz upstream-7533087565005ecb41954790d4991cb7c32bb066.tar.bz2 upstream-7533087565005ecb41954790d4991cb7c32bb066.zip |
kernel: bump 4.19 to 4.19.84
Refreshed all patches.
Altered patches:
- 950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch
- 950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch
- 902-debloat_proc.patch
Remove upstreamed:
- 150-MIPS-bmips-mark-exception-vectors-as-char-arrays.patch
New symbols:
X86_INTEL_MPX
X86_INTEL_MEMORY_PROTECTION_KEYS
X86_INTEL_TSX_MODE_OFF
X86_INTEL_TSX_MODE_ON
X86_INTEL_TSX_MODE_AUTO
Compile-tested on: cns3xxx, x86_64
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch')
-rw-r--r-- | target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index 64eda53295..7c10f6f189 100644 --- a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> nf_ct_gc_expired(tmp); --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c -@@ -183,6 +183,24 @@ static const struct rhashtable_params nf +@@ -183,10 +183,29 @@ static const struct rhashtable_params nf .automatic_shrinking = true, }; @@ -79,15 +79,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow) { int err; -@@ -203,6 +221,7 @@ int flow_offload_add(struct nf_flowtable - return err; - } + nf_ct_offload_timeout(flow); flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT; - return 0; - } -@@ -316,6 +335,8 @@ static int nf_flow_offload_gc_step(struc + + err = rhashtable_insert_fast(&flow_table->rhashtable, +@@ -317,6 +336,8 @@ static int nf_flow_offload_gc_step(struc rhashtable_walk_start(&hti); while ((tuplehash = rhashtable_walk_next(&hti))) { @@ -96,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (IS_ERR(tuplehash)) { err = PTR_ERR(tuplehash); if (err != -EAGAIN) -@@ -328,9 +349,13 @@ static int nf_flow_offload_gc_step(struc +@@ -329,9 +350,13 @@ static int nf_flow_offload_gc_step(struc flow = container_of(tuplehash, struct flow_offload, tuplehash[0]); |