diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-10-14 14:30:25 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-10-15 16:14:13 +0200 |
| commit | 31181fa06288189834a945b0e3d71c9823b481a1 (patch) | |
| tree | d4e649543589e883eb8f69b78d0e5e9cd52da7b8 /target/linux/generic/pending-4.14 | |
| parent | 9628612abe5e1de5001c2a7a89ffe9f8eeb10d4e (diff) | |
| download | upstream-31181fa06288189834a945b0e3d71c9823b481a1.tar.gz upstream-31181fa06288189834a945b0e3d71c9823b481a1.tar.bz2 upstream-31181fa06288189834a945b0e3d71c9823b481a1.zip | |
kernel: bump 4.14 to 4.14.149
Refreshed all patches.
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.14')
| -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 f0b1704f3b..3a5ae909ef 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 -@@ -4952,6 +4952,14 @@ static int nf_tables_flowtable_parse_hoo +@@ -4955,6 +4955,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; -@@ -5082,10 +5090,19 @@ static int nf_tables_newflowtable(struct +@@ -5085,10 +5093,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) -@@ -5183,7 +5200,8 @@ static int nf_tables_fill_flowtable_info +@@ -5186,7 +5203,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), |