diff options
-rw-r--r-- | include/net/inet_timewait_sock.h | 2 | ||||
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 4 | ||||
-rw-r--r-- | net/ipv6/addrconf.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 5794bc6bf0bf..6d14c22a00c5 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
@@ -186,7 +186,7 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk) | |||
186 | return (struct inet_timewait_sock *)sk; | 186 | return (struct inet_timewait_sock *)sk; |
187 | } | 187 | } |
188 | 188 | ||
189 | static inline u32 inet_rcv_saddr(const struct sock *sk) | 189 | static inline __be32 inet_rcv_saddr(const struct sock *sk) |
190 | { | 190 | { |
191 | return likely(sk->sk_state != TCP_TIME_WAIT) ? | 191 | return likely(sk->sk_state != TCP_TIME_WAIT) ? |
192 | inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr; | 192 | inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr; |
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 }; | |||
39 | int inet_csk_bind_conflict(const struct sock *sk, | 39 | int 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; |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c18676352397..e03c33b2465b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1258,8 +1258,8 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) | |||
1258 | { | 1258 | { |
1259 | const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; | 1259 | const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; |
1260 | const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); | 1260 | const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); |
1261 | u32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr; | 1261 | __be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr; |
1262 | u32 sk2_rcv_saddr = inet_rcv_saddr(sk2); | 1262 | __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2); |
1263 | int sk_ipv6only = ipv6_only_sock(sk); | 1263 | int sk_ipv6only = ipv6_only_sock(sk); |
1264 | int sk2_ipv6only = inet_v6_ipv6only(sk2); | 1264 | int sk2_ipv6only = inet_v6_ipv6only(sk2); |
1265 | int addr_type = ipv6_addr_type(sk_rcv_saddr6); | 1265 | int addr_type = ipv6_addr_type(sk_rcv_saddr6); |