diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-17 13:31:05 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 11:38:58 +0200 |
| commit | cf6526249298bef88526b676531d2c66b96f7154 (patch) | |
| tree | 9101c353e5b7610ace84b0fad34b97afa9a2381a /target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | |
| parent | de5105febe49e16f8d1aafc35bd10121020503b4 (diff) | |
| download | upstream-cf6526249298bef88526b676531d2c66b96f7154.tar.gz upstream-cf6526249298bef88526b676531d2c66b96f7154.tar.bz2 upstream-cf6526249298bef88526b676531d2c66b96f7154.zip | |
kernel: bump 4.19 to 4.19.51
Refreshed all patches.
Altered patches:
- 370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
- 220-optimize_inlining.patch
- 640-netfilter-nf_flow_table-add-hardware-offload-support.patch
This patch also restores the initial implementation
of the ath79 perfcount IRQ issue. (78ee6b1a40b5)
It was wrongfully backported upstream initially and got reverted now.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
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 | 16 |
1 files changed, 10 insertions, 6 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 cc8e00353d..69f0a5fd24 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,11 +54,11 @@ 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,8 +183,27 @@ static const struct rhashtable_params nf +@@ -183,6 +183,24 @@ static const struct rhashtable_params nf .automatic_shrinking = true, }; -+#define DAY (86400 * HZ) ++#define DAY (86400 * HZ) + +/* Set an arbitrary timeout large enough not to ever expire, this save + * us a check for the IPS_OFFLOAD_BIT from the packet path via @@ -78,11 +78,15 @@ 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; - - rhashtable_insert_fast(&flow_table->rhashtable, -@@ -305,6 +324,8 @@ static int nf_flow_offload_gc_step(struc + return 0; + } +@@ -316,6 +335,8 @@ static int nf_flow_offload_gc_step(struc rhashtable_walk_start(&hti); while ((tuplehash = rhashtable_walk_next(&hti))) { @@ -91,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (IS_ERR(tuplehash)) { err = PTR_ERR(tuplehash); if (err != -EAGAIN) -@@ -317,9 +338,13 @@ static int nf_flow_offload_gc_step(struc +@@ -328,9 +349,13 @@ static int nf_flow_offload_gc_step(struc flow = container_of(tuplehash, struct flow_offload, tuplehash[0]); |