Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / include / net / netfilter / nf_conntrack_expect.h

diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 424d4bdb9848e9d4e7d49a0ea2d2c765d4da946d..cae1a0dce36555e80c5451a1e92098fb6de96d6f 100644 (file)
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -6,14 +6,14 @@
 #define _NF_CONNTRACK_EXPECT_H
 #include <net/netfilter/nf_conntrack.h>
 
-extern struct list_head nf_ct_expect_list;
 extern struct hlist_head *nf_ct_expect_hash;
 extern unsigned int nf_ct_expect_hsize;
+extern unsigned int nf_ct_expect_max;
 
 struct nf_conntrack_expect
 {
-       /* Internal linked list (global expectation list) */
-       struct list_head list;
+       /* Conntrack expectation list member */
+       struct hlist_node lnode;
 
        /* Hash member */
        struct hlist_node hnode;