X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpending-4.9%2F600-netfilter_conntrack_flush.patch;h=81dac2ab232506e276ea3cf031f37a7123afbf2a;hp=606ef8baad93c264c723dc150476766b5f261c44;hb=2d02a4f5bda4a5ff392286360ec7d1129bd77d25;hpb=d9564d79b8e91eed23c45afd2eb4a71a97c922eb diff --git a/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch index 606ef8baad..81dac2ab23 100644 --- a/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch +++ b/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch @@ -7,8 +7,6 @@ Signed-off-by: Felix Fietkau net/netfilter/nf_conntrack_standalone.c | 59 ++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) -diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index 5f446cd9f3fd..4c1856b5151f 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -17,6 +17,7 @@ @@ -19,7 +17,7 @@ index 5f446cd9f3fd..4c1856b5151f 100644 #include #ifdef CONFIG_SYSCTL #include -@@ -298,10 +299,66 @@ static int ct_open(struct inode *inode, struct file *file) +@@ -298,10 +299,66 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } @@ -86,7 +84,7 @@ index 5f446cd9f3fd..4c1856b5151f 100644 .llseek = seq_lseek, .release = seq_release_net, }; -@@ -405,7 +462,7 @@ static int nf_conntrack_standalone_init_proc(struct net *net) +@@ -405,7 +462,7 @@ static int nf_conntrack_standalone_init_ kuid_t root_uid; kgid_t root_gid; @@ -95,6 +93,3 @@ index 5f446cd9f3fd..4c1856b5151f 100644 if (!pde) goto out_nf_conntrack; --- -2.11.0 -