diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-11 14:58:36 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-12 13:54:24 +0200 |
| commit | ca903c73c70592fc49649235770fa49823efab96 (patch) | |
| tree | cd9f9fc2eadb0b8ff3aa121c1537753bf7b5a9f0 /target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch | |
| parent | 3a5498c5e55d3fad5df14d94366e331642f0eb77 (diff) | |
| download | upstream-ca903c73c70592fc49649235770fa49823efab96.tar.gz upstream-ca903c73c70592fc49649235770fa49823efab96.tar.bz2 upstream-ca903c73c70592fc49649235770fa49823efab96.zip | |
kernel: bump 4.14 to 4.14.54 for 18.06
Refreshed all patches
Reworked patches to match upstream:
335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
Compile-tested on: cns3xxx, imx6, x86_64
Runtime-tested on: cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 d755c17fc3..7aab67fc2c 100644 --- 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, |