[NETFILTER]: nf_conntrack_helper/nf_conntrack_netlink: convert to expectation hash

Convert from the global expectation list to the hash table.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 9 deletions

diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index fdabf823f8c..cc8ae7404ac 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -114,22 +114,25 @@ EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);
 
 void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
 {
-        unsigned int i;
         struct nf_conntrack_tuple_hash *h;
-        struct nf_conntrack_expect *exp, *tmp;
-        struct hlist_node *n;
+        struct nf_conntrack_expect *exp;
+        struct hlist_node *n, *next;
+        unsigned int i;
 
         /* Need write lock here, to delete helper. */
         write_lock_bh(&nf_conntrack_lock);
         list_del(&me->list);
 
         /* Get rid of expectations */
-        list_for_each_entry_safe(exp, tmp, &nf_ct_expect_list, list) {
-                struct nf_conn_help *help = nfct_help(exp->master);
-                if ((help->helper == me || exp->helper == me) &&
-                    del_timer(&exp->timeout)) {
-                        nf_ct_unlink_expect(exp);
-                        nf_ct_expect_put(exp);
+        for (i = 0; i < nf_ct_expect_hsize; i++) {
+                hlist_for_each_entry_safe(exp, n, next,
+                                          &nf_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)) {
+                                nf_ct_unlink_expect(exp);
+                                nf_ct_expect_put(exp);
+                        }
                 }
         }