wireguard: avoid double unlikely() notation when using IS_ERR()
Subsystems (3)
PATCH 1/1 wireguard: 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/wireguard/device.c | 2 +- drivers/net/wireguard/socket.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireguard/device.c +1 -1
@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) }else {struct sk_buff *segs =skb_gso_segment (skb,0 ); -if (unlikely (IS_ERR (segs))) { +if (IS_ERR (segs)) { ret =PTR_ERR (segs); goto err_peer; }
drivers/net/wireguard/socket.c +2 -2
@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,ip_rt_put (rt); rt =ip_route_output_flow (sock_net (sock), &fl, sock); } -if (unlikely (IS_ERR (rt))) { +if (IS_ERR (rt)) { ret =PTR_ERR (rt);net_dbg_ratelimited ("%s: No route to %pISpfsc, error %d\n" , wg->dev->name, &endpoint->addr, ret);
@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, } dst = ipv6_stub->ipv6_dst_lookup_flow (sock_net (sock), sock, &fl,NULL ); -if (unlikely (IS_ERR (dst))) { +if (IS_ERR (dst)) { ret =PTR_ERR (dst);net_dbg_ratelimited ("%s: No route to %pISpfsc, error %d\n" , wg->dev->name, &endpoint->addr, ret);
Signature · 1 line
2.29.2
Jason A. Donenfeld
maintainerQuoted 7 lines · Antonio Quartulli
The definition of
IS_ERR()already applies theunlikely()notation when checking the error status of the passed pointer. For this reason there is no need to have the same notation outside ofIS_ERR()itself.Clean up code by removing redundant notation.
Thanks for the patch. I can confirm this doesn't change the codgen at all.
I've queued this up in wireguard's staging tree, and I'll push it back out as part of the next series.
Jason