diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-09-06 14:25:15 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-09-07 17:21:24 +0200 |
| commit | 079871983c90eee18f6926d10c8d2fdc16b1cafd (patch) | |
| tree | 25e23fad9c32db85936817c9ba7d6c1996e26af9 /target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | |
| parent | 752ee31ad279cf52042c36b3351597a918155ac0 (diff) | |
| download | upstream-079871983c90eee18f6926d10c8d2fdc16b1cafd.tar.gz upstream-079871983c90eee18f6926d10c8d2fdc16b1cafd.tar.bz2 upstream-079871983c90eee18f6926d10c8d2fdc16b1cafd.zip | |
kernel: bump 4.14 to 4.14.68
Refreshed all patches.
Remove upstream accepted:
- 330-Revert-MIPS-BCM47XX-Enable-74K-Core-ExternalSync-for.patch
Altered:
- 303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
- 308-mips32r2_tune.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index bf902875d0..e6d3392838 100644 --- a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.14/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 -@@ -4917,6 +4917,14 @@ static int nf_tables_flowtable_parse_hoo +@@ -4933,6 +4933,14 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) goto err1; @@ -521,7 +521,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ops = kzalloc(sizeof(struct nf_hook_ops) * n, GFP_KERNEL); if (!ops) { err = -ENOMEM; -@@ -5047,10 +5055,19 @@ static int nf_tables_newflowtable(struct +@@ -5063,10 +5071,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -541,7 +541,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) -@@ -5148,7 +5165,8 @@ static int nf_tables_fill_flowtable_info +@@ -5164,7 +5181,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), |