kernel: bump 4.14 to 4.14.232

[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 600-netfilter_conntrack_flush.patch

diff --git a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
index f39ed62dc0aa06ebafddec0dad3c0dce222b0019..14a23a9fea18001a04b28d40cb11384bc5956388 100644 (file)
--- a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <net/net_namespace.h>
  #ifdef CONFIG_SYSCTL
  #include <linux/sysctl.h>
-@@ -377,10 +378,66 @@ static int ct_open(struct inode *inode,
+@@ -382,10 +383,66 @@ static int ct_open(struct inode *inode,
                        sizeof(struct ct_iter_state));
  }
  
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        .llseek  = seq_lseek,
        .release = seq_release_net,
  };
-@@ -484,7 +541,7 @@ static int nf_conntrack_standalone_init_
+@@ -489,7 +546,7 @@ static int nf_conntrack_standalone_init_
        kuid_t root_uid;
        kgid_t root_gid;