xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Introduce ipv4_addr_hash and use it for tcp metrics

Browse Source 
Refactors a common line into helper function.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern
2015-08-27 16:06:59 -07:00
committed by David S. Miller
parent 8f58336d3f
commit 72afa352d6
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/ip.h
View File

@@ -458,6 +458,11 @@ static __inline__ void inet_reset_saddr(struct sock *sk)
#endif #endif
static inline unsigned int ipv4_addr_hash(__be32 ip)
{
return (__force unsigned int) ip;
}
bool ip_call_ra_chain(struct sk_buff *skb); bool ip_call_ra_chain(struct sk_buff *skb);
/* /*

12
net/ipv4/tcp_metrics.c
View File

@@ -249,7 +249,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,
case AF_INET: case AF_INET:
saddr.addr.a4 = inet_rsk(req)->ir_loc_addr; saddr.addr.a4 = inet_rsk(req)->ir_loc_addr;
daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr; daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr;
hash = (__force unsigned int) daddr.addr.a4; hash = ipv4_addr_hash(inet_rsk(req)->ir_rmt_addr);
break; break;
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
case AF_INET6: case AF_INET6:
@@ -289,7 +289,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock
saddr.addr.a4 = tw->tw_rcv_saddr; saddr.addr.a4 = tw->tw_rcv_saddr;
daddr.family = AF_INET; daddr.family = AF_INET;
daddr.addr.a4 = tw->tw_daddr; daddr.addr.a4 = tw->tw_daddr;
hash = (__force unsigned int) daddr.addr.a4; hash = ipv4_addr_hash(tw->tw_daddr);
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
else if (tw->tw_family == AF_INET6) { else if (tw->tw_family == AF_INET6) {
@@ -298,7 +298,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock
saddr.addr.a4 = tw->tw_rcv_saddr; saddr.addr.a4 = tw->tw_rcv_saddr;
daddr.family = AF_INET; daddr.family = AF_INET;
daddr.addr.a4 = tw->tw_daddr; daddr.addr.a4 = tw->tw_daddr;
hash = (__force unsigned int) daddr.addr.a4; hash = ipv4_addr_hash(tw->tw_daddr);
} else { } else {
saddr.family = AF_INET6; saddr.family = AF_INET6;
saddr.addr.in6 = tw->tw_v6_rcv_saddr; saddr.addr.in6 = tw->tw_v6_rcv_saddr;
@@ -339,7 +339,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,
saddr.addr.a4 = inet_sk(sk)->inet_saddr; saddr.addr.a4 = inet_sk(sk)->inet_saddr;
daddr.family = AF_INET; daddr.family = AF_INET;
daddr.addr.a4 = inet_sk(sk)->inet_daddr; daddr.addr.a4 = inet_sk(sk)->inet_daddr;
hash = (__force unsigned int) daddr.addr.a4; hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
else if (sk->sk_family == AF_INET6) { else if (sk->sk_family == AF_INET6) {
@@ -348,7 +348,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,
saddr.addr.a4 = inet_sk(sk)->inet_saddr; saddr.addr.a4 = inet_sk(sk)->inet_saddr;
daddr.family = AF_INET; daddr.family = AF_INET;
daddr.addr.a4 = inet_sk(sk)->inet_daddr; daddr.addr.a4 = inet_sk(sk)->inet_daddr;
hash = (__force unsigned int) daddr.addr.a4; hash = ipv4_addr_hash(inet_sk(sk)->inet_daddr);
} else { } else {
saddr.family = AF_INET6; saddr.family = AF_INET6;
saddr.addr.in6 = sk->sk_v6_rcv_saddr; 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,
addr->family = AF_INET; addr->family = AF_INET;
addr->addr.a4 = nla_get_in_addr(a); addr->addr.a4 = nla_get_in_addr(a);
if (hash) if (hash)
*hash = (__force unsigned int) addr->addr.a4; *hash = ipv4_addr_hash(addr->addr.a4);
return 0; return 0;
} }
a = info->attrs[v6]; a = info->attrs[v6];