Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_helper.c

diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 8e0b4c8f62a8da1156d72c5e96b8c6f9e1c42e29..c39b6a9941331c8fe6c6fe2a80130f04bd1b1129 100644 (file)
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/rculist.h>
+#include <linux/rtnetlink.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l3proto.h>
@@ -123,29 +124,18 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);
 
-void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
+static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me,
+                                            struct net *net)
 {
        struct nf_conntrack_tuple_hash *h;
        struct nf_conntrack_expect *exp;
        const struct hlist_node *n, *next;
        unsigned int i;
 
-       mutex_lock(&nf_ct_helper_mutex);
-       hlist_del_rcu(&me->hnode);
-       nf_ct_helper_count--;
-       mutex_unlock(&nf_ct_helper_mutex);
-
-       /* Make sure every nothing is still using the helper unless its a
-        * connection in the hash.
-        */
-       synchronize_rcu();
-
-       spin_lock_bh(&nf_conntrack_lock);
-
        /* Get rid of expectations */
        for (i = 0; i < nf_ct_expect_hsize; i++) {
                hlist_for_each_entry_safe(exp, n, next,
-                                         &nf_ct_expect_hash[i], hnode) {
+                                         &net->ct.expect_hash[i], hnode) {
                        struct nf_conn_help *help = nfct_help(exp->master);
                        if ((help->helper == me || exp->helper == me) &&
                            del_timer(&exp->timeout)) {
@@ -156,13 +146,34 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
        }
 
        /* Get rid of expecteds, set helpers to NULL. */
-       hlist_for_each_entry(h, n, &unconfirmed, hnode)
+       hlist_for_each_entry(h, n, &net->ct.unconfirmed, hnode)
                unhelp(h, me);
        for (i = 0; i < nf_conntrack_htable_size; i++) {
-               hlist_for_each_entry(h, n, &nf_conntrack_hash[i], hnode)
+               hlist_for_each_entry(h, n, &net->ct.hash[i], hnode)
                        unhelp(h, me);
        }
+}
+
+void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
+{
+       struct net *net;
+
+       mutex_lock(&nf_ct_helper_mutex);
+       hlist_del_rcu(&me->hnode);
+       nf_ct_helper_count--;
+       mutex_unlock(&nf_ct_helper_mutex);
+
+       /* Make sure every nothing is still using the helper unless its a
+        * connection in the hash.
+        */
+       synchronize_rcu();
+
+       rtnl_lock();
+       spin_lock_bh(&nf_conntrack_lock);
+       for_each_net(net)
+               __nf_conntrack_helper_unregister(me, net);
        spin_unlock_bh(&nf_conntrack_lock);
+       rtnl_unlock();
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_unregister);