diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-26 22:45:23 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-26 22:45:23 -0700 |
commit | 01e6de64d9c8d0e75dca3bb4cf898db73abe00d4 (patch) | |
tree | 925982e6241e5ac47f268bc2c2942ab0f06775cd /include/net/netfilter/nf_conntrack_tuple.h | |
parent | 8f1ead2d1a626ed0c85b3d2c2046a49081d5933f (diff) | |
parent | d271e8bd8c60ce059ee36d836ba063cfc61c3e21 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/net/netfilter/nf_conntrack_tuple.h')
-rw-r--r-- | include/net/netfilter/nf_conntrack_tuple.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h index f2f6aa73dc1..2628c154d40 100644 --- a/include/net/netfilter/nf_conntrack_tuple.h +++ b/include/net/netfilter/nf_conntrack_tuple.h @@ -12,6 +12,7 @@ #include <linux/netfilter/x_tables.h> #include <linux/netfilter/nf_conntrack_tuple_common.h> +#include <linux/list_nulls.h> /* A `tuple' is a structure containing the information to uniquely identify a connection. ie. if two packets have the same tuple, they @@ -146,9 +147,8 @@ static inline void nf_ct_dump_tuple(const struct nf_conntrack_tuple *t) ((enum ip_conntrack_dir)(h)->tuple.dst.dir) /* Connections have two entries in the hash table: one for each way */ -struct nf_conntrack_tuple_hash -{ - struct hlist_node hnode; +struct nf_conntrack_tuple_hash { + struct hlist_nulls_node hnnode; struct nf_conntrack_tuple tuple; }; |