aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-06 14:18:24 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-07 17:22:23 +0200
commit55bbd8293c9f6e8f8814e0788df4ee9fb3671a09 (patch)
tree6096b320c0b2186448a7dff8de5e78e33e317f88 /target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
parent81d73ae747881387efd060db5c42c98de694024d (diff)
downloadupstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.tar.gz
upstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.tar.bz2
upstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.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/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch')
-rw-r--r--target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
index 9c98fa73c4..ae30a984d5 100644
--- a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
+++ b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
@@ -82,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));
type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
-@@ -4970,7 +4967,7 @@ static int nf_tables_flowtable_parse_hoo
+@@ -4986,7 +4983,7 @@ static int nf_tables_flowtable_parse_hoo
return -EINVAL;
hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM]));