From 26f8113cc720b6362432cb8b9ed61dc913418b0c Mon Sep 17 00:00:00 2001 From: Enrico Weigelt Date: Wed, 5 Jun 2019 23:11:34 +0200 Subject: [PATCH] net: ipv6: drop unneeded likely() call around IS_ERR() IS_ERR() already calls unlikely(), so this extra unlikely() call around IS_ERR() is not needed. Signed-off-by: Enrico Weigelt Signed-off-by: David S. Miller --- 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 f3515ebe9b3a..c42252eae873 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -178,7 +178,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 07fa579dfb96..4a7869db5b6a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -219,7 +219,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; } -- 2.11.0