summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAntonio Quartulli <a@unstable.cc>2020-12-10 09:55:05 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-12-21 12:35:43 +0100
commit27300724823f7ecce3fcbcee8e567a80d16f2b4c (patch)
treef53650c4fab9117807467d2ce41f78965ec51ef2
parent8dcc75dbbe0a7b82c7c9a9388a49d1e32723d8a9 (diff)
global: 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: Antonio Quartulli <a@unstable.cc> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/device.c2
-rw-r--r--src/socket.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/device.c b/src/device.c
index 1155783..c673446 100644
--- a/src/device.c
+++ b/src/device.c
@@ -165,7 +165,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/src/socket.c b/src/socket.c
index c33e2c8..e9c3513 100644
--- a/src/socket.c
+++ b/src/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);