kernel : Bump to 4.14.325

[librecmc/librecmc.git] / target / linux / generic / backport-4.14 / 315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch

diff --git a/target/linux/generic/backport-4.14/315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch b/target/linux/generic/backport-4.14/315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch
index 7f6e90470afe41990488dc20dae7606c8017a37a..1dc555fbc01ccd2d09850798fbceccf1a4b138ae 100644 (file)
--- a/target/linux/generic/backport-4.14/315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch
+++ b/target/linux/generic/backport-4.14/315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch
@@ -113,7 +113,7 @@ Acked-by: Florian Westphal <fw@strlen.de>
  #ifdef CONFIG_NF_CONNTRACK_ZONES
  static void nft_ct_tmpl_put_pcpu(void)
  {
-@@ -489,7 +456,7 @@ static int nft_ct_get_init(const struct
+@@ -488,7 +455,7 @@ static int nft_ct_get_init(const struct
        if (err < 0)
                return err;
  
@@ -122,7 +122,7 @@ Acked-by: Florian Westphal <fw@strlen.de>
        if (err < 0)
                return err;
  
-@@ -583,7 +550,7 @@ static int nft_ct_set_init(const struct
+@@ -581,7 +548,7 @@ static int nft_ct_set_init(const struct
        if (err < 0)
                goto err1;
  
@@ -131,7 +131,7 @@ Acked-by: Florian Westphal <fw@strlen.de>
        if (err < 0)
                goto err1;
  
-@@ -606,7 +573,7 @@ static void nft_ct_set_destroy(const str
+@@ -604,7 +571,7 @@ static void nft_ct_set_destroy(const str
        struct nft_ct *priv = nft_expr_priv(expr);
  
        __nft_ct_set_destroy(ctx, priv);