diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
commit | b2e63b8ea81fae72aef69649631cf491bac5306f (patch) | |
tree | 9a4bc7d83c339b4b842999287e3ae5e5d5d6734a /target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch | |
parent | 32f3b1e3582701ef6c8c248b9ad0a761c42bbc1b (diff) | |
download | upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.gz upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.bz2 upstream-b2e63b8ea81fae72aef69649631cf491bac5306f.zip |
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 36008
Diffstat (limited to 'target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch')
-rw-r--r-- | target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch new file mode 100644 index 0000000000..be37095c89 --- /dev/null +++ b/target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch @@ -0,0 +1,46 @@ +--- a/net/netfilter/nf_conntrack_standalone.c ++++ b/net/netfilter/nf_conntrack_standalone.c +@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, + sizeof(struct ct_iter_state)); + } + ++static int kill_all(struct nf_conn *i, void *data) ++{ ++ return 1; ++} ++ ++static ssize_t ct_file_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct seq_file *seq = file->private_data; ++ struct net *net = seq_file_net(seq); ++ ++ if (count) { ++ char c; ++ ++ if (get_user(c, buf)) ++ return -EFAULT; ++ ++ if (c == 'f') ++ nf_ct_iterate_cleanup(net, kill_all, NULL); ++ } ++ return count; ++} ++ + static const struct file_operations ct_file_ops = { + .owner = THIS_MODULE, + .open = ct_open, + .read = seq_read, ++ .write = ct_file_write, + .llseek = seq_lseek, + .release = seq_release_net, + }; +@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_ + { + struct proc_dir_entry *pde; + +- pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops); ++ pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops); + if (!pde) + goto out_nf_conntrack; + |