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

Commit 82103232 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[IPV4]: inet_rcv_saddr() annotations 



inet_rcv_saddr() returns net-endian

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23f33c2d

include/net/inet_timewait_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk) 
	return (struct inet_timewait_sock *)sk;

}



static inline u32 inet_rcv_saddr(const struct sock *sk)

static inline __be32 inet_rcv_saddr(const struct sock *sk)

{

	return likely(sk->sk_state != TCP_TIME_WAIT) ?

		inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;

net/ipv4/inet_connection_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int sysctl_local_port_range[2] = { 1024, 4999 }; 
int inet_csk_bind_conflict(const struct sock *sk,

			   const struct inet_bind_bucket *tb)

{

	const u32 sk_rcv_saddr = inet_rcv_saddr(sk);

	const __be32 sk_rcv_saddr = inet_rcv_saddr(sk);

	struct sock *sk2;

	struct hlist_node *node;

	int reuse = sk->sk_reuse;
@@ -52,7 +52,7 @@ int inet_csk_bind_conflict(const struct sock *sk, 
		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {

			if (!reuse || !sk2->sk_reuse ||

			    sk2->sk_state == TCP_LISTEN) {

				const u32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

				const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

				if (!sk2_rcv_saddr || !sk_rcv_saddr ||

				    sk2_rcv_saddr == sk_rcv_saddr)

					break;

net/ipv6/addrconf.c

+2 −2
Original line number Diff line number Diff line
@@ -1258,8 +1258,8 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) 
{

	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;

	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);

	u32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr;

	u32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

	__be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr;

	__be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

	int sk_ipv6only = ipv6_only_sock(sk);

	int sk2_ipv6only = inet_v6_ipv6only(sk2);

	int addr_type = ipv6_addr_type(sk_rcv_saddr6);