Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

include/net/netfilter/nf_conntrack_core.h

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, 


/* Find a connection corresponding to a tuple. */

extern 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);



extern int __nf_conntrack_confirm(struct sk_buff **pskb);

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
		return -EINVAL;

	}



	h = nf_conntrack_find_get(&tuple, NULL);

	h = nf_conntrack_find_get(&tuple);

	if (h) {

		struct sockaddr_in sin;

		struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -187,13 +187,13 @@ icmp_error_message(struct sk_buff *skb, 


	*ctinfo = IP_CT_RELATED;



	h = nf_conntrack_find_get(&innertuple, NULL);

	h = nf_conntrack_find_get(&innertuple);

	if (!h) {

		/* Locally generated ICMPs will match inverted if they

		   haven't been SNAT'ed yet */

		/* FIXME: NAT code has to handle half-done double NAT --RR */

		if (hooknum == NF_IP_LOCAL_OUT)

			h = nf_conntrack_find_get(&origtuple, NULL);

			h = nf_conntrack_find_get(&origtuple);



		if (!h) {

			DEBUGP("icmp_error_message: no match\n");

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ icmpv6_error_message(struct sk_buff *skb, 


	*ctinfo = IP_CT_RELATED;



	h = nf_conntrack_find_get(&intuple, NULL);

	h = nf_conntrack_find_get(&intuple);

	if (!h) {

		DEBUGP("icmpv6_error: no match\n");

		return -NF_ACCEPT;

net/netfilter/nf_conntrack_core.c

+3 −4
Original line number Diff line number Diff line
@@ -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)