Commit 30ac4e2f authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Jakub Kicinski

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.
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fc0494ea
...@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev)
} else { } else {
struct sk_buff *segs = skb_gso_segment(skb, 0); struct sk_buff *segs = skb_gso_segment(skb, 0);
if (unlikely(IS_ERR(segs))) { if (IS_ERR(segs)) {
ret = PTR_ERR(segs); ret = PTR_ERR(segs);
goto err_peer; goto err_peer;
} }
......
...@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, ...@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
ip_rt_put(rt); ip_rt_put(rt);
rt = ip_route_output_flow(sock_net(sock), &fl, sock); rt = ip_route_output_flow(sock_net(sock), &fl, sock);
} }
if (unlikely(IS_ERR(rt))) { if (IS_ERR(rt)) {
ret = PTR_ERR(rt); ret = PTR_ERR(rt);
net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
wg->dev->name, &endpoint->addr, ret); wg->dev->name, &endpoint->addr, ret);
...@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, ...@@ -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, dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl,
NULL); NULL);
if (unlikely(IS_ERR(dst))) { if (IS_ERR(dst)) {
ret = PTR_ERR(dst); ret = PTR_ERR(dst);
net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
wg->dev->name, &endpoint->addr, ret); wg->dev->name, &endpoint->addr, ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment