diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-11 11:35:24 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-13 16:40:29 +0200 |
| commit | 78c3a18a1e7c57fbc529f0feab60167d53edec31 (patch) | |
| tree | 29a755608f36c28afe90ca7b65717279f2bca02c /target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | |
| parent | 6a4f4246fb4f7934350960c23c398f05ea1cff41 (diff) | |
| download | upstream-78c3a18a1e7c57fbc529f0feab60167d53edec31.tar.gz upstream-78c3a18a1e7c57fbc529f0feab60167d53edec31.tar.bz2 upstream-78c3a18a1e7c57fbc529f0feab60167d53edec31.zip | |
kernel: bump 4.19 to 4.19.72
Refreshed all patches.
Remove upstreamed:
- 390-v5.3-net-sched-fix-action-ipt-crash.patch
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch')
| -rw-r--r-- | target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 6932214826..f85e7523c2 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5463,6 +5463,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5468,6 +5468,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5594,10 +5601,19 @@ static int nf_tables_newflowtable(struct +@@ -5599,10 +5606,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5723,7 +5739,8 @@ static int nf_tables_fill_flowtable_info +@@ -5728,7 +5744,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), @@ -552,7 +552,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> nest = nla_nest_start(skb, NFTA_FLOWTABLE_HOOK); --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c -@@ -135,6 +135,9 @@ static void nft_flow_offload_eval(const +@@ -138,6 +138,9 @@ static void nft_flow_offload_eval(const if (ret < 0) goto err_flow_add; |