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 <info@metux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index f3515ebe9b3a7c4c214827c10fd0e6fdbe4b37fd..c42252eae873d086474d9d3bf5289bf8a3e840c7 100644 (file)
--- 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 07fa579dfb96c642873d5904d5309ccfbfde8167..4a7869db5b6ab023675cf8164ddf7115e860b56f 100644 (file)
--- 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;
 }