From 3a1beabe115910d848c959268ae6d68b4da77fd7 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 8 Oct 2024 10:54:54 +0200 Subject: [PATCH] ipv6: Remove redundant unlikely() IS_ERR_OR_NULL() already implies unlikely(). Signed-off-by: Tobias Klauser Reviewed-by: Simon Horman Link: https://patch.msgid.link/20241008085454.8087-1-tklauser@distanz.ch Signed-off-by: Jakub Kicinski --- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 205673179b3c2..f7b4608bb316e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -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)) { -- 2.47.2