aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-14 16:34:24 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-20 13:41:49 +0100
commit692b91f56b8966519a4faa75667fc2937e458ed3 (patch)
tree8435f76459eb380210a6250845b2f1c6bc861a07 /target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
parentb5480de4d1527216cdc3719670a203fb05e72e88 (diff)
downloadupstream-692b91f56b8966519a4faa75667fc2937e458ed3.tar.gz
upstream-692b91f56b8966519a4faa75667fc2937e458ed3.tar.bz2
upstream-692b91f56b8966519a4faa75667fc2937e458ed3.zip
kernel: bump 4.19 to 4.19.95
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.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.patch6
1 files changed, 3 insertions, 3 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 0a1e017f89..d9274012cb 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
-@@ -5470,6 +5470,13 @@ static int nf_tables_flowtable_parse_hoo
+@@ -5478,6 +5478,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;
-@@ -5601,10 +5608,19 @@ static int nf_tables_newflowtable(struct
+@@ -5609,10 +5616,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)
-@@ -5730,7 +5746,8 @@ static int nf_tables_fill_flowtable_info
+@@ -5738,7 +5754,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),