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/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.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/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-.patch | 2 |
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])); |