diff options
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
-rw-r--r-- | net/ipv4/tcp_metrics.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index b3d64f61d922..3a4289268f97 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c | |||
@@ -249,7 +249,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req, | |||
249 | case AF_INET: | 249 | case AF_INET: |
250 | saddr.addr.a4 = inet_rsk(req)->ir_loc_addr; | 250 | saddr.addr.a4 = inet_rsk(req)->ir_loc_addr; |
251 | daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr; | 251 | daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr; |
252 | hash = (__force unsigned int) daddr.addr.a4; | 252 | hash = ipv4_addr_hash(inet_rsk(req)->ir_rmt_addr); |
253 | break; | 253 | break; |
254 | #if IS_ENABLED(CONFIG_IPV6) | 254 | #if IS_ENABLED(CONFIG_IPV6) |
255 | case AF_INET6: | 255 | case AF_INET6: |
@@ -289,7 +289,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock | |||
289 | saddr.addr.a4 = tw->tw_rcv_saddr; | 289 | saddr.addr.a4 = tw->tw_rcv_saddr; |
290 | daddr.family = AF_INET; | 290 | daddr.family = AF_INET; |
291 | daddr.addr.a4 = tw->tw_daddr; | 291 | daddr.addr.a4 = tw->tw_daddr; |
292 | hash = (__force unsigned int) daddr.addr.a4; | 292 | hash = ipv4_addr_hash(tw->tw_daddr); |
293 | } | 293 | } |
294 | #if IS_ENABLED(CONFIG_IPV6) | 294 | #if IS_ENABLED(CONFIG_IPV6) |
295 | else if (tw->tw_family == AF_INET6) { | 295 | else if (tw->tw_family == AF_INET6) { |
@@ -298,7 +298,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock | |||
298 | saddr.addr.a4 = tw->tw_rcv_saddr; | 298 | saddr.addr.a4 = tw->tw_rcv_saddr; |
299 | daddr.family = AF_INET; | 299 | daddr.family = AF_INET; |
300 | daddr.addr.a4 = tw->tw_daddr; | 300 | daddr.addr.a4 = tw->tw_daddr; |
301 | hash = (__force unsigned int) daddr.addr.a4; | 301 | hash = ipv4_addr_hash(tw->tw_daddr); |
302 | } else { | 302 | } else { |
303 | saddr.family = AF_INET6; | 303 | saddr.family = AF_INET6; |
304 | saddr.addr.in6 = tw->tw_v6_rcv_saddr; | 304 | saddr.addr.in6 = tw->tw_v6_rcv_saddr; |
@@ -339,7 +339,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk, | |||
339 | saddr.addr.a4 = inet_sk(sk)->inet_saddr; | 339 | saddr.addr.a4 = inet_sk(sk)->inet_saddr; |
340 | daddr.family = AF_INET; | 340 | daddr.family = AF_INET; |
341 | daddr.addr.a4 = inet_sk(sk)->inet_daddr; | 341 | daddr.addr.a4 = inet_sk(sk)->inet_daddr; |
342 | hash = (__force unsigned int) daddr.addr.a4; | 342 | hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr); |
343 | } | 343 | } |
344 | #if IS_ENABLED(CONFIG_IPV6) | 344 | #if IS_ENABLED(CONFIG_IPV6) |
345 | else if (sk->sk_family == AF_INET6) { | 345 | else if (sk->sk_family == AF_INET6) { |
@@ -348,7 +348,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk, | |||
348 | saddr.addr.a4 = inet_sk(sk)->inet_saddr; | 348 | saddr.addr.a4 = inet_sk(sk)->inet_saddr; |
349 | daddr.family = AF_INET; | 349 | daddr.family = AF_INET; |
350 | daddr.addr.a4 = inet_sk(sk)->inet_daddr; | 350 | daddr.addr.a4 = inet_sk(sk)->inet_daddr; |
351 | hash = (__force unsigned int) daddr.addr.a4; | 351 | hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr); |
352 | } else { | 352 | } else { |
353 | saddr.family = AF_INET6; | 353 | saddr.family = AF_INET6; |
354 | saddr.addr.in6 = sk->sk_v6_rcv_saddr; | 354 | saddr.addr.in6 = sk->sk_v6_rcv_saddr; |
@@ -959,7 +959,7 @@ static int __parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr, | |||
959 | addr->family = AF_INET; | 959 | addr->family = AF_INET; |
960 | addr->addr.a4 = nla_get_in_addr(a); | 960 | addr->addr.a4 = nla_get_in_addr(a); |
961 | if (hash) | 961 | if (hash) |
962 | *hash = (__force unsigned int) addr->addr.a4; | 962 | *hash = ipv4_addr_hash(addr->addr.a4); |
963 | return 0; | 963 | return 0; |
964 | } | 964 | } |
965 | a = info->attrs[v6]; | 965 | a = info->attrs[v6]; |