diff options
author | Patrick McHardy | 2007-07-08 07:28:42 +0200 |
---|---|---|
committer | David S. Miller | 2007-07-11 07:17:41 +0200 |
commit | 330f7db5e578e1e298ba3a41748e5ea333a64a2b (patch) | |
tree | 1557656cf800dcee7915cb41c94d4ce644947c61 /net/netfilter/nf_conntrack_core.c | |
parent | [NETFILTER]: nf_conntrack: use hlists for conntrack hash (diff) | |
download | kernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.tar.gz kernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.tar.xz kernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.zip |
[NETFILTER]: nf_conntrack: remove 'ignore_conntrack' argument from nf_conntrack_find_get
All callers pass NULL, this also doesn't seem very useful for modules.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 992d0ef31fa3..8ed761cc0819 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -244,13 +244,12 @@ EXPORT_SYMBOL_GPL(__nf_conntrack_find); /* Find a connection corresponding to a tuple. */ struct nf_conntrack_tuple_hash * -nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple, - const struct nf_conn *ignored_conntrack) +nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple) { struct nf_conntrack_tuple_hash *h; read_lock_bh(&nf_conntrack_lock); - h = __nf_conntrack_find(tuple, ignored_conntrack); + h = __nf_conntrack_find(tuple, NULL); if (h) atomic_inc(&nf_ct_tuplehash_to_ctrack(h)->ct_general.use); read_unlock_bh(&nf_conntrack_lock); @@ -574,7 +573,7 @@ resolve_normal_ct(struct sk_buff *skb, } /* look for tuple match */ - h = nf_conntrack_find_get(&tuple, NULL); + h = nf_conntrack_find_get(&tuple); if (!h) { h = init_conntrack(&tuple, l3proto, l4proto, skb, dataoff); if (!h) |