diff options
| author | Antonio Quartulli <a@unstable.cc> | 2021-02-22 17:25:43 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-07-07 13:26:43 +0200 |
| commit | 3f85f32a82c1f9ef29034c297e715a2f23981b10 (patch) | |
| tree | 26a490b015b57fe0a0f21b2beb0d72e541a17f1d | |
| parent | de80daac3fb5a81bfeea84d9bfa9bf454d5b1291 (diff) | |
| download | wireguard-linux-trimmed-3f85f32a82c1f9ef29034c297e715a2f23981b10.tar.gz wireguard-linux-trimmed-3f85f32a82c1f9ef29034c297e715a2f23981b10.zip | |
wireguard: avoid double unlikely() notation when using IS_ERR()
commit b8aed1598eb2c6c3f4ddcc501e3037100367498f upstream.
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.
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | drivers/net/wireguard/device.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireguard/socket.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index c9f65e9..46ecec7 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -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; } diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index c33e2c8..e9c3513 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -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); |