kernel: bump 4.14 to 4.14.54

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.14 / 314-v4.16-netfilter-meta-secpath-support.patch

diff --git a/target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch b/target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch
index d755c17fc3329d452bbb11d2a2cab1a52ceb3e80..7aab67fc2c153b77d22caa84548f98cdcd5f01c6 100644 (file)
--- a/target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch
+++ b/target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch
@@ -40,7 +40,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        default:
                WARN_ON(1);
                goto err;
-@@ -308,6 +313,11 @@ int nft_meta_get_init(const struct nft_c
+@@ -310,6 +315,11 @@ int nft_meta_get_init(const struct nft_c
                prandom_init_once(&nft_prandom_state);
                len = sizeof(u32);
                break;
@@ -52,7 +52,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        default:
                return -EOPNOTSUPP;
        }
-@@ -318,6 +328,38 @@ int nft_meta_get_init(const struct nft_c
+@@ -320,6 +330,38 @@ int nft_meta_get_init(const struct nft_c
  }
  EXPORT_SYMBOL_GPL(nft_meta_get_init);
  
@@ -91,7 +91,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  int nft_meta_set_validate(const struct nft_ctx *ctx,
                          const struct nft_expr *expr,
                          const struct nft_data **data)
-@@ -434,6 +476,7 @@ static const struct nft_expr_ops nft_met
+@@ -436,6 +478,7 @@ static const struct nft_expr_ops nft_met
        .eval           = nft_meta_get_eval,
        .init           = nft_meta_get_init,
        .dump           = nft_meta_get_dump,