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

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

[NETFILTER]: Rename misnamed function 



Both __ip_conntrack_expect_find and ip_conntrack_expect_find_get take
a reference to the expectation, the difference is that callers of
__ip_conntrack_expect_find must hold ip_conntrack_lock.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e674d0f3

include/linux/netfilter_ipv4/ip_conntrack.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -384,7 +384,7 @@ extern struct ip_conntrack_expect * 
__ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);

__ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);





extern struct ip_conntrack_expect *

extern struct ip_conntrack_expect *

ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple);

ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);





extern struct ip_conntrack_tuple_hash *

extern struct ip_conntrack_tuple_hash *

__ip_conntrack_find(const struct ip_conntrack_tuple *tuple,

__ip_conntrack_find(const struct ip_conntrack_tuple *tuple,

net/ipv4/netfilter/ip_conntrack_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,7 @@ __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple) 




/* Just find a expectation corresponding to a tuple. */

/* Just find a expectation corresponding to a tuple. */

struct ip_conntrack_expect *

struct ip_conntrack_expect *

ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple)

ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple)

{

{

	struct ip_conntrack_expect *i;

	struct ip_conntrack_expect *i;

net/ipv4/netfilter/ip_conntrack_netlink.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1270,7 +1270,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, 
	if (err < 0)

	if (err < 0)

		return err;

		return err;





	exp = ip_conntrack_expect_find_get(&tuple);

	exp = ip_conntrack_expect_find(&tuple);

	if (!exp)

	if (!exp)

		return -ENOENT;

		return -ENOENT;
@@ -1318,7 +1318,7 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb, 
			return err;

			return err;





		/* bump usage count to 2 */

		/* bump usage count to 2 */

		exp = ip_conntrack_expect_find_get(&tuple);

		exp = ip_conntrack_expect_find(&tuple);

		if (!exp)

		if (!exp)

			return -ENOENT;

			return -ENOENT;

net/ipv4/netfilter/ip_conntrack_standalone.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -993,11 +993,11 @@ EXPORT_SYMBOL(ip_ct_refresh_acct); 




EXPORT_SYMBOL(ip_conntrack_expect_alloc);

EXPORT_SYMBOL(ip_conntrack_expect_alloc);

EXPORT_SYMBOL(ip_conntrack_expect_put);

EXPORT_SYMBOL(ip_conntrack_expect_put);

EXPORT_SYMBOL_GPL(ip_conntrack_expect_find_get);

EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find);

EXPORT_SYMBOL_GPL(ip_conntrack_expect_find);

EXPORT_SYMBOL(ip_conntrack_expect_related);

EXPORT_SYMBOL(ip_conntrack_expect_related);

EXPORT_SYMBOL(ip_conntrack_unexpect_related);

EXPORT_SYMBOL(ip_conntrack_unexpect_related);

EXPORT_SYMBOL_GPL(ip_conntrack_expect_list);

EXPORT_SYMBOL_GPL(ip_conntrack_expect_list);

EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find);

EXPORT_SYMBOL_GPL(ip_ct_unlink_expect);

EXPORT_SYMBOL_GPL(ip_ct_unlink_expect);





EXPORT_SYMBOL(ip_conntrack_tuple_taken);

EXPORT_SYMBOL(ip_conntrack_tuple_taken);