mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Quartulli <a@unstable.cc>
|
|
Date: Mon, 22 Feb 2021 17:25:43 +0100
|
|
Subject: [PATCH] wireguard: avoid double unlikely() notation when using
|
|
IS_ERR()
|
|
|
|
commit 30ac4e2f54ec067b7b9ca0db27e75681581378d6 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>
|
|
---
|
|
drivers/net/wireguard/device.c | 2 +-
|
|
drivers/net/wireguard/socket.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/device.c
|
|
+++ b/drivers/net/wireguard/device.c
|
|
@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buf
|
|
} 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;
|
|
}
|
|
--- a/drivers/net/wireguard/socket.c
|
|
+++ b/drivers/net/wireguard/socket.c
|
|
@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, s
|
|
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, s
|
|
}
|
|
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);
|