mac80211: make listen_interval be limited by low level driver

[linux-2.6] / net / netfilter / nf_conntrack_helper.c

diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index e350f56d43c976a699b72cc1e36f3b49abfa9788..8e0b4c8f62a8da1156d72c5e96b8c6f9e1c42e29 100644 (file)
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/rculist.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l3proto.h>
@@ -126,7 +127,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
 {
        struct nf_conntrack_tuple_hash *h;
        struct nf_conntrack_expect *exp;
-       struct hlist_node *n, *next;
+       const struct hlist_node *n, *next;
        unsigned int i;
 
        mutex_lock(&nf_ct_helper_mutex);