Skip to contentSkip to conversation

vxlan: avoid double unlikely() notation when using IS_ERR()

PATCH Applied Antonio Quartulli 2 participants 2 messages Dec 10, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vxlan: avoid double unlikely() notation when using IS_ERR()

The definition of IS_ERR() already applies the unlikely() notation when checking the error status of the passed pointer. For this reason there is no need to have the same notation outside of IS_ERR() itself.

Clean up code by removing redundant notation.

---
 drivers/net/vxlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/vxlan.c +1 -1
index e1e44d68ac4b..a8ad710629e6 100644
@@ -2477,7 +2477,7 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
 
 	ndst = ipv6_stub->ipv6_dst_lookup_flow(vxlan->net, sock6->sock->sk,
 					       &fl6, NULL);
-	if (unlikely(IS_ERR(ndst))) {
+	if (IS_ERR(ndst)) {
 		netdev_dbg(dev, "no route to %pI6\n", daddr);
 		return ERR_PTR(-ENETUNREACH);
 	}
Signature · 1 line
2.29.2
maintainer Applied
#1 lore raw

From: Antonio Quartulli <[email protected]>
Date: Thu, 10 Dec 2020 09:55:49 +0100

Quoted 8 lines

The definition of IS_ERR() already applies the unlikely() notation when checking the error status of the passed pointer. For this reason there is no need to have the same notation outside of IS_ERR() itself.

Clean up code by removing redundant notation.

Applied to net-next, thanks.