From nobody Fri Jul 25 17:39:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bpZqr4qk8z627Zb; Fri, 25 Jul 2025 17:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpZqq5VXDz3S2G; Fri, 25 Jul 2025 17:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fJq71J2Ufn0zLhVtk3paXK29EOGH+1gcUitGNhheZQ=; b=TRA2b9RTz8DmxIEL5CSMp7V4tj49FgOcv08h1WJt9RH6SIFNRA97u8d86RsJviQEK9s9Dq Vak8nLqbkmWDpDwrxcyCnvSwRLbLuyDLhtUvAGpiMdKc1Urzzskt27mquh+2RjX2+lUltZ WB5AQUNeImZ0yd1DO+F29wvX/oroIDMV3K5YSZkkVToZUT+tOswiJY1tQ4nsAkvbhlxhaK SMPB8H0v7Fsi3hIWGDQCt9I0UFl4Uzmm5hEtWz/JjRtVdxGAUfYo4Cr7AsAtYCP9lv6gpz uwqElf4XEmRusbFYm25Iob46R5HA8f7lDgqT5NZCU9cs2m0xZ3KNWZAQkoReNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fJq71J2Ufn0zLhVtk3paXK29EOGH+1gcUitGNhheZQ=; b=FbmAB0VpsDL2El/nv4hEQW5O4u1AEP6gQb1rFw6SHeAxZV8CeeSTn9zTPEva5mg6GsJcZA arccx69guYPXmACtzAD0UIFE27GnyHblptzoLzi/0fbiBanG0gIhzzhuE0ThrN87+hnMNH JW9bYJpQg1txeV5q05ZMuJH8IFipNTbmvCVfNO+KeBIQUGupoE3FR9zOf9KXegPaz2zJuB zRvWIxbHw7bc/7vuKDd0OGkKmIpOC7S/ObAwAj/ftrJ0bl5wvKcNF0ZnXa2Xv/MQYXLhtA kd9gvuvrD65dwAdYReZSt5dqkVuNoIx4dnzMWL1mwEesUcnxq8oojlggyg0OlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753465159; a=rsa-sha256; cv=none; b=hivCCW4XZDS6WfrIkVRR3neDBPQAithdcXhTBvQNN0H9t3107O28c1sOpqhaZU5+0XDTZP rjlmxfEkFLKHffuvXbm8azUn80GOQLa8k0kJQsbO57TEpcuzZ8+fA4p0JqYCm9HNkvmdaB 91CtYFM+KOn2sGwaQ45NexXRC6r9SSl+yltE/3rT1xwqXve3S09Sbcfwpg6J5Xi28cvG1g cLKyWvfQBQ/0JtfEsYAntrhB2Wt6MtgQLKN1bZZ+boToQ44IlWhgQeCTtNdn8HHDXhhbUq s8jBJWUWk8n2+k6KuWTlpVWVWFs1DzC3tCgEBODDgft7V1kq8gt7XGdT8l4P2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bpZqq4xPJztsW; Fri, 25 Jul 2025 17:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PHdJg6012830; Fri, 25 Jul 2025 17:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PHdJsB012827; Fri, 25 Jul 2025 17:39:19 GMT (envelope-from git) Date: Fri, 25 Jul 2025 17:39:19 GMT Message-Id: <202507251739.56PHdJsB012827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26ef5e9e234f - main - if_ovpn: Remove a no-op function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ef5e9e234f1d1729dd43b15d1e591e479f1816 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26ef5e9e234f1d1729dd43b15d1e591e479f1816 commit 26ef5e9e234f1d1729dd43b15d1e591e479f1816 Author: Mark Johnston AuthorDate: 2025-07-25 13:14:08 +0000 Commit: Mark Johnston CommitDate: 2025-07-25 17:39:01 +0000 if_ovpn: Remove a no-op function ovpn used to maintain one socket ref per peer. This scheme was changed in commit 3acf7e0da487 ("if_ovpn: avoid LOR between ovpn and UDP locks"), which turned ovpn_rele_so() in a no-op. Just remove the whole function and a related helper, as the remaining assertion there isn't useful. No functional change intended. Reviewed by: kp MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51497 --- sys/net/if_ovpn.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 67530281eefa..d3ee1654ce82 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -372,33 +372,6 @@ ovpn_nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *sa) return (0); } -static bool -ovpn_has_peers(struct ovpn_softc *sc) -{ - OVPN_ASSERT(sc); - - return (sc->peercount > 0); -} - -static void -ovpn_rele_so(struct ovpn_softc *sc) -{ - bool has_peers; - - OVPN_WASSERT(sc); - - if (sc->so == NULL) - return; - - has_peers = ovpn_has_peers(sc); - - if (! has_peers) { - MPASS(sc->peercount == 0); - } else { - MPASS(sc->peercount > 0); - } -} - static void ovpn_notify_del_peer(struct ovpn_softc *sc, struct ovpn_kpeer *peer) { @@ -487,8 +460,6 @@ ovpn_peer_release_ref(struct ovpn_kpeer *peer, bool locked) ovpn_free_kkey_dir(peer->keys[i].decrypt); } - ovpn_rele_so(sc); - callout_stop(&peer->ping_send); callout_stop(&peer->ping_rcv); uma_zfree_pcpu(pcpu_zone_4, peer->last_active);