From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93F0CC35242 for ; Fri, 14 Feb 2020 22:57:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5758C20848 for ; Fri, 14 Feb 2020 22:57:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="vqhwfFaM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728107AbgBNW5l (ORCPT ); Fri, 14 Feb 2020 17:57:41 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:36023 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728097AbgBNW5k (ORCPT ); Fri, 14 Feb 2020 17:57:40 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 46632ae4; Fri, 14 Feb 2020 22:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=NyvKafbAeLBnRgEa+4ksCm66N Yc=; b=vqhwfFaMqD0316yxs1rpoimlqNUkR/VyOW72Rh25nK7gw9IAKsbwbcysz Suly5rK1fTTgzqGR0aoh+9VGPeoz/QT1GHCYuUCpsr41foEbzU+f2yXtqhTjVp2U eLMG42Wvt1kOwx1jZ3gjfamgKlERWuu9g02jJKsZLEzXIfuQBcVdOrdjWKMMkRIU 26APrVftTYPY7R8h0AOgBjAunUJt4F3rvUNQkGmmayh4NvcyNUTu9wRHu1/GNf5r Et42FIw/82Zsv4xwBw0SZjAeb2WWx0lGdrfjv4GnkHKjgnkPk4YUf1ySN5YuC8+V CS53OEkTV9h8JFQKaFFMYBa3l/TRQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 5de6430b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 14 Feb 2020 22:55:28 +0000 (UTC) From: "Jason A. Donenfeld" To: davem@davemloft.net, netdev@vger.kernel.org Cc: "Jason A. Donenfeld" , Eric Dumazet Subject: [PATCH v3 net 4/4] wireguard: socket: remove extra call to synchronize_net Date: Fri, 14 Feb 2020 23:57:23 +0100 Message-Id: <20200214225723.63646-5-Jason@zx2c4.com> In-Reply-To: <20200214225723.63646-1-Jason@zx2c4.com> References: <20200214225723.63646-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Suggested-by: Eric Dumazet --- drivers/net/wireguard/socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index 262f3b5c819d..b0d6541582d3 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -432,7 +432,6 @@ void wg_socket_reinit(struct wg_device *wg, struct sock *new4, 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); } -- 2.25.0