| Message ID | 20200825114048.24515-1-linmiaohe@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: Avoid unnecessary inet_addr_type() call when addr is INADDR_ANY | expand |
From: Miaohe Lin <linmiaohe@huawei.com> Date: Tue, 25 Aug 2020 07:40:48 -0400 > We can avoid unnecessary inet_addr_type() call by check addr against > INADDR_ANY first. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Applied to net-next.
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index cc09d1135ce2..19a947bf0faa 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -310,10 +310,10 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n", sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port)); - chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr); - if (addr->sin_addr.s_addr == htonl(INADDR_ANY)) chk_addr_ret = RTN_LOCAL; + else + chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr); if ((!inet_can_nonlocal_bind(net, isk) && chk_addr_ret != RTN_LOCAL) ||
We can avoid unnecessary inet_addr_type() call by check addr against INADDR_ANY first. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)