* [PATCH] net: ipv6: drop unneeded likely() call around IS_ERR()
@ 2019-06-05 21:11 Enrico Weigelt, metux IT consult
2019-06-05 23:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2019-06-05 21:11 UTC (permalink / raw)
To: linux-kernel
Cc: davem, kuznet, yoshfuji, kafai, songliubraving, yhs, netdev, bpf
From: Enrico Weigelt <info@metux.net>
IS_ERR() already calls unlikely(), so this extra unlikely() call
around IS_ERR() is not needed.
Signed-off-by: Enrico Weigelt <info@metux.net>
---
net/ipv6/inet6_hashtables.c | 2 +-
net/ipv6/udp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index b2a55f3..cf60fae 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -174,7 +174,7 @@ struct sock *inet6_lookup_listener(struct net *net,
saddr, sport, &in6addr_any, hnum,
dif, sdif);
done:
- if (unlikely(IS_ERR(result)))
+ if (IS_ERR(result))
return NULL;
return result;
}
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index b3418a7..6935183 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -215,7 +215,7 @@ struct sock *__udp6_lib_lookup(struct net *net,
exact_dif, hslot2,
skb);
}
- if (unlikely(IS_ERR(result)))
+ if (IS_ERR(result))
return NULL;
return result;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: ipv6: drop unneeded likely() call around IS_ERR()
2019-06-05 21:11 [PATCH] net: ipv6: drop unneeded likely() call around IS_ERR() Enrico Weigelt, metux IT consult
@ 2019-06-05 23:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-06-05 23:58 UTC (permalink / raw)
To: info
Cc: linux-kernel, kuznet, yoshfuji, kafai, songliubraving, yhs, netdev, bpf
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 5 Jun 2019 23:11:34 +0200
> From: Enrico Weigelt <info@metux.net>
>
> IS_ERR() already calls unlikely(), so this extra unlikely() call
> around IS_ERR() is not needed.
>
> Signed-off-by: Enrico Weigelt <info@metux.net>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-05 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 21:11 [PATCH] net: ipv6: drop unneeded likely() call around IS_ERR() Enrico Weigelt, metux IT consult
2019-06-05 23:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).