kernel: bump 4.14 to 4.14.60

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.14 / 327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch

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 307749763a9117987910e55ad1b53c97fc6f14b6..9c98fa73c47e6fe52fbffa66eaeef6038201c6cd 100644 (file)
--- 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];
-@@ -4969,7 +4966,7 @@ static int nf_tables_flowtable_parse_hoo
+@@ -4970,7 +4967,7 @@ static int nf_tables_flowtable_parse_hoo
                return -EINVAL;
  
        hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM]));