Commit 330f7db5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f205c5e0
...@@ -58,8 +58,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, ...@@ -58,8 +58,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
/* Find a connection corresponding to a tuple. */ /* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash * extern struct nf_conntrack_tuple_hash *
nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple, nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple);
const struct nf_conn *ignored_conntrack);
extern int __nf_conntrack_confirm(struct sk_buff **pskb); extern int __nf_conntrack_confirm(struct sk_buff **pskb);
......
...@@ -334,7 +334,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) ...@@ -334,7 +334,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
return -EINVAL; return -EINVAL;
} }
h = nf_conntrack_find_get(&tuple, NULL); h = nf_conntrack_find_get(&tuple);
if (h) { if (h) {
struct sockaddr_in sin; struct sockaddr_in sin;
struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);
......
...@@ -187,13 +187,13 @@ icmp_error_message(struct sk_buff *skb, ...@@ -187,13 +187,13 @@ icmp_error_message(struct sk_buff *skb,
*ctinfo = IP_CT_RELATED; *ctinfo = IP_CT_RELATED;
h = nf_conntrack_find_get(&innertuple, NULL); h = nf_conntrack_find_get(&innertuple);
if (!h) { if (!h) {
/* Locally generated ICMPs will match inverted if they /* Locally generated ICMPs will match inverted if they
haven't been SNAT'ed yet */ haven't been SNAT'ed yet */
/* FIXME: NAT code has to handle half-done double NAT --RR */ /* FIXME: NAT code has to handle half-done double NAT --RR */
if (hooknum == NF_IP_LOCAL_OUT) if (hooknum == NF_IP_LOCAL_OUT)
h = nf_conntrack_find_get(&origtuple, NULL); h = nf_conntrack_find_get(&origtuple);
if (!h) { if (!h) {
DEBUGP("icmp_error_message: no match\n"); DEBUGP("icmp_error_message: no match\n");
......
...@@ -193,7 +193,7 @@ icmpv6_error_message(struct sk_buff *skb, ...@@ -193,7 +193,7 @@ icmpv6_error_message(struct sk_buff *skb,
*ctinfo = IP_CT_RELATED; *ctinfo = IP_CT_RELATED;
h = nf_conntrack_find_get(&intuple, NULL); h = nf_conntrack_find_get(&intuple);
if (!h) { if (!h) {
DEBUGP("icmpv6_error: no match\n"); DEBUGP("icmpv6_error: no match\n");
return -NF_ACCEPT; return -NF_ACCEPT;
......
...@@ -244,13 +244,12 @@ EXPORT_SYMBOL_GPL(__nf_conntrack_find); ...@@ -244,13 +244,12 @@ EXPORT_SYMBOL_GPL(__nf_conntrack_find);
/* Find a connection corresponding to a tuple. */ /* Find a connection corresponding to a tuple. */
struct nf_conntrack_tuple_hash * struct nf_conntrack_tuple_hash *
nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple, nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple)
const struct nf_conn *ignored_conntrack)
{ {
struct nf_conntrack_tuple_hash *h; struct nf_conntrack_tuple_hash *h;
read_lock_bh(&nf_conntrack_lock); read_lock_bh(&nf_conntrack_lock);
h = __nf_conntrack_find(tuple, ignored_conntrack); h = __nf_conntrack_find(tuple, NULL);
if (h) if (h)
atomic_inc(&nf_ct_tuplehash_to_ctrack(h)->ct_general.use); atomic_inc(&nf_ct_tuplehash_to_ctrack(h)->ct_general.use);
read_unlock_bh(&nf_conntrack_lock); read_unlock_bh(&nf_conntrack_lock);
...@@ -574,7 +573,7 @@ resolve_normal_ct(struct sk_buff *skb, ...@@ -574,7 +573,7 @@ resolve_normal_ct(struct sk_buff *skb,
} }
/* look for tuple match */ /* look for tuple match */
h = nf_conntrack_find_get(&tuple, NULL); h = nf_conntrack_find_get(&tuple);
if (!h) { if (!h) {
h = init_conntrack(&tuple, l3proto, l4proto, skb, dataoff); h = init_conntrack(&tuple, l3proto, l4proto, skb, dataoff);
if (!h) if (!h)
......
...@@ -689,7 +689,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb, ...@@ -689,7 +689,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
if (err < 0) if (err < 0)
return err; return err;
h = nf_conntrack_find_get(&tuple, NULL); h = nf_conntrack_find_get(&tuple);
if (!h) if (!h)
return -ENOENT; return -ENOENT;
...@@ -744,7 +744,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb, ...@@ -744,7 +744,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
if (err < 0) if (err < 0)
return err; return err;
h = nf_conntrack_find_get(&tuple, NULL); h = nf_conntrack_find_get(&tuple);
if (!h) if (!h)
return -ENOENT; return -ENOENT;
...@@ -1426,7 +1426,7 @@ ctnetlink_create_expect(struct nfattr *cda[], u_int8_t u3) ...@@ -1426,7 +1426,7 @@ ctnetlink_create_expect(struct nfattr *cda[], u_int8_t u3)
return err; return err;
/* Look for master conntrack of this expectation */ /* Look for master conntrack of this expectation */
h = nf_conntrack_find_get(&master_tuple, NULL); h = nf_conntrack_find_get(&master_tuple);
if (!h) if (!h)
return -ENOENT; return -ENOENT;
ct = nf_ct_tuplehash_to_ctrack(h); ct = nf_ct_tuplehash_to_ctrack(h);
......
...@@ -146,7 +146,7 @@ static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t) ...@@ -146,7 +146,7 @@ static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t)
DEBUGP("trying to timeout ct or exp for tuple "); DEBUGP("trying to timeout ct or exp for tuple ");
NF_CT_DUMP_TUPLE(t); NF_CT_DUMP_TUPLE(t);
h = nf_conntrack_find_get(t, NULL); h = nf_conntrack_find_get(t);
if (h) { if (h) {
sibling = nf_ct_tuplehash_to_ctrack(h); sibling = nf_ct_tuplehash_to_ctrack(h);
DEBUGP("setting timeout of conntrack %p to 0\n", sibling); DEBUGP("setting timeout of conntrack %p to 0\n", sibling);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment