diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-20 10:31:41 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-21 09:45:15 +0200 |
| commit | f442b306f9b74e805828d458ab412256d7709ffb (patch) | |
| tree | 9a1fb3b84479a0516f93b8ef8045f333851768ad /target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | |
| parent | 00324e434e1dbaf7f25d3c85529f92d5917efecb (diff) | |
| download | upstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.gz upstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.bz2 upstream-f442b306f9b74e805828d458ab412256d7709ffb.zip | |
kernel: bump 4.14 to 4.14.120
Refreshed all patches.
Remove upstreamed:
- 103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
- 060-fix-oxnas-rps-dt-match.patch
Altered patches:
- 0067-generic-Mangle-bootloader-s-kernel-arguments.patch
- 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
- 996-generic-Mangle-bootloader-s-kernel-arguments.patch
Compile-tested on: ar71xx, cns3xxx, imx6, mvebu, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
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 62ba525601..f0b1704f3b 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 -@@ -4933,6 +4933,14 @@ static int nf_tables_flowtable_parse_hoo +@@ -4952,6 +4952,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; -@@ -5063,10 +5071,19 @@ static int nf_tables_newflowtable(struct +@@ -5082,10 +5090,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) -@@ -5164,7 +5181,8 @@ static int nf_tables_fill_flowtable_info +@@ -5183,7 +5200,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), |