mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +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>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Fri, 14 Feb 2020 23:57:23 +0100
|
|
Subject: [PATCH] wireguard: socket: remove extra call to synchronize_net
|
|
|
|
commit 1fbc33b0a7feb6ca72bf7dc8a05d81485ee8ee2e upstream.
|
|
|
|
synchronize_net() is a wrapper around synchronize_rcu(), so there's no
|
|
point in having synchronize_net and synchronize_rcu back to back,
|
|
despite the documentation comment suggesting maybe it's somewhat useful,
|
|
"Wait for packets currently being received to be done." This commit
|
|
removes the extra call.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Reviewed-by: Eric Dumazet <edumazet@google.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/socket.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireguard/socket.c
|
|
+++ b/drivers/net/wireguard/socket.c
|
|
@@ -432,7 +432,6 @@ void wg_socket_reinit(struct wg_device *
|
|
wg->incoming_port = ntohs(inet_sk(new4)->inet_sport);
|
|
mutex_unlock(&wg->socket_update_lock);
|
|
synchronize_rcu();
|
|
- synchronize_net();
|
|
sock_free(old4);
|
|
sock_free(old6);
|
|
}
|