From: Enrico Weigelt <i...@metux.net>

IS_ERR() already calls unlikely(), so this extra unlikely() call
around IS_ERR() is not needed.

Signed-off-by: Enrico Weigelt <i...@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

Reply via email to