ipv6: Remove redundant unlikely()
authorTobias Klauser <tklauser@distanz.ch>
Tue, 8 Oct 2024 08:54:54 +0000 (10:54 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 10 Oct 2024 02:40:46 +0000 (19:40 -0700)
IS_ERR_OR_NULL() already implies unlikely().

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241008085454.8087-1-tklauser@distanz.ch
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/ip6_output.c

index 205673179b3c2673e09fdaa23b0b6e6b2b141e1c..f7b4608bb316ed2114a0e626aad530b62b767fc1 100644 (file)
@@ -127,7 +127,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
        nexthop = rt6_nexthop(dst_rt6_info(dst), daddr);
        neigh = __ipv6_neigh_lookup_noref(dev, nexthop);
 
-       if (unlikely(IS_ERR_OR_NULL(neigh))) {
+       if (IS_ERR_OR_NULL(neigh)) {
                if (unlikely(!neigh))
                        neigh = __neigh_create(&nd_tbl, nexthop, dev, false);
                if (IS_ERR(neigh)) {