aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_connection_sock.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 21:44:10 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:02:28 -0400
commit82103232edc4b4ed48949a195aca93cfa3fe3fa8 (patch)
tree59df0023c030b466bb4398cf7a42ac3121c8ec09 /net/ipv4/inet_connection_sock.c
parent23f33c2d4fd5986243b67a2bf5e63ebae1a76ffa (diff)
[IPV4]: inet_rcv_saddr() annotations
inet_rcv_saddr() returns net-endian Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r--net/ipv4/inet_connection_sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 274b0b846c25..96bbe2a0aa1b 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -39,7 +39,7 @@ int sysctl_local_port_range[2] = { 1024, 4999 };
39int inet_csk_bind_conflict(const struct sock *sk, 39int inet_csk_bind_conflict(const struct sock *sk,
40 const struct inet_bind_bucket *tb) 40 const struct inet_bind_bucket *tb)
41{ 41{
42 const u32 sk_rcv_saddr = inet_rcv_saddr(sk); 42 const __be32 sk_rcv_saddr = inet_rcv_saddr(sk);
43 struct sock *sk2; 43 struct sock *sk2;
44 struct hlist_node *node; 44 struct hlist_node *node;
45 int reuse = sk->sk_reuse; 45 int reuse = sk->sk_reuse;
@@ -52,7 +52,7 @@ int inet_csk_bind_conflict(const struct sock *sk,
52 sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { 52 sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
53 if (!reuse || !sk2->sk_reuse || 53 if (!reuse || !sk2->sk_reuse ||
54 sk2->sk_state == TCP_LISTEN) { 54 sk2->sk_state == TCP_LISTEN) {
55 const u32 sk2_rcv_saddr = inet_rcv_saddr(sk2); 55 const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
56 if (!sk2_rcv_saddr || !sk_rcv_saddr || 56 if (!sk2_rcv_saddr || !sk_rcv_saddr ||
57 sk2_rcv_saddr == sk_rcv_saddr) 57 sk2_rcv_saddr == sk_rcv_saddr)
58 break; 58 break;