Skip to content

Commit 2730072

Browse files
ordexzx2c4
authored andcommitted
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>
1 parent 8dcc75d commit 2730072

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev)
165165
} else {
166166
struct sk_buff *segs = skb_gso_segment(skb, 0);
167167

168-
if (unlikely(IS_ERR(segs))) {
168+
if (IS_ERR(segs)) {
169169
ret = PTR_ERR(segs);
170170
goto err_peer;
171171
}

src/socket.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
7171
ip_rt_put(rt);
7272
rt = ip_route_output_flow(sock_net(sock), &fl, sock);
7373
}
74-
if (unlikely(IS_ERR(rt))) {
74+
if (IS_ERR(rt)) {
7575
ret = PTR_ERR(rt);
7676
net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
7777
wg->dev->name, &endpoint->addr, ret);
@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb,
138138
}
139139
dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl,
140140
NULL);
141-
if (unlikely(IS_ERR(dst))) {
141+
if (IS_ERR(dst)) {
142142
ret = PTR_ERR(dst);
143143
net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
144144
wg->dev->name, &endpoint->addr, ret);

0 commit comments

Comments
 (0)