From nobody Thu Jan 30 12:42:34 2025 X-Original-To: dev-commits-src-all@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 4YkJZf3xJmz5mHCw; Thu, 30 Jan 2025 12:42:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YkJZf34mkz42cK; Thu, 30 Jan 2025 12:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738240954; 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=4MbEKC/Q06PxCJ7kV7M8nJ7AF3uRlnSl7QIwCY9/J4E=; b=Jgaz8m+P5LmiaS2VRFap7wkFRJ8Kh+BJQD0z9RlIGnwgYB9SW5CiJa2/rFXBg5ujLPfzWh w0xpCjf/9Y+14COkTYKNaDPQFSE8u2jGxZpyagtaBaK0fnumQe7HXevxAZOD8s+IFkWL9X UNiTmH1I1I+rgL9JL34Zh5fFusRe3aOIeWeLqWmDROq3LY786gohm1ZYtGRw3rH7QRpAXn 1Be5Ysq96DrVw/kOojBX7CrRfQENyAJuaqDBXEokIPHoqcKWETeympkWz71m/+jrtA31Yt qUVWtKt79WSyIp16iGHPxb0wCpLzAUE68yfJxZ5osjPhxK9yjGeUloxsaVjRNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738240954; 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=4MbEKC/Q06PxCJ7kV7M8nJ7AF3uRlnSl7QIwCY9/J4E=; b=r9TRCNUoR+Mv6M0q0aWTMWMnSc7yBr7dDm+IBzYPWgI8l4pPNPxEwOhKmrc/8c4tJ9QvnA ylB7P6NptZtUrPwiUomvkscT/98WBYTTJE0JivlalnvvbLZoNOnAor0quKreUELuMI4jjt JpBw1pGcP3+yTCNTqf12JXZ+rsSrCOXVxi0khft7fqdpXAs+2v9/8wlGs8eMCLLGB8zK0J GAXyur0gUk4C1duIv5JLe7/tij9aUJEfmdYvG9aeitPtldMKE6uLn93CXTMMLER/rjakY2 7D5CgIfUwOGnozfC7LX/RgWDSViFA9IIwWbh2I90kYchbFrw58BBTyo+yJC90g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738240954; a=rsa-sha256; cv=none; b=phqZqj5ErMypSFH3qdFd0mgaZmbBT03EFjWFMd/GGl3eVrDFKDzkbF5TPM+dAX+0tufiQR tQXyovP1AJ/9bsErmLnbG5/fnp7OxDQIA5CoVcbJX9I5widV9rC4ecIfABGFmByjJFMtV7 G9mkrvb9DivhC3ab/7rqKVoM0lnrbQfED7/7Yydwvuc4BcBegAoKEEd3AiarivgiRKY0ZB Vgff6TVAlHJ3ye/J2OZx02JU7pgyzJk9hBveZ0rlkjrxUUXz0dpfOOvW0AiVeyWi/z/mq+ e31X++0Ap8ZFtwsQGzeiST1hj5Y6mxtnKqLKsxIuR1enXjNNc7cJKhu631jzEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkJZf2c6zzp4p; Thu, 30 Jan 2025 12:42:34 +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 50UCgYI9065989; Thu, 30 Jan 2025 12:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UCgYkN065986; Thu, 30 Jan 2025 12:42:34 GMT (envelope-from git) Date: Thu, 30 Jan 2025 12:42:34 GMT Message-Id: <202501301242.50UCgYkN065986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a55197c3228c - main - if_ovpn: fix module load in NOINET6 kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a55197c3228cd015ebc8218afbc938ef09191a98 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a55197c3228cd015ebc8218afbc938ef09191a98 commit a55197c3228cd015ebc8218afbc938ef09191a98 Author: Kristof Provost AuthorDate: 2025-01-30 11:06:19 +0000 Commit: Kristof Provost CommitDate: 2025-01-30 11:07:15 +0000 if_ovpn: fix module load in NOINET6 kernels PR: 284459 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 8dc90ecce725..cbcfe15dffc7 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -587,6 +587,7 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) memcpy(&peer->remote, &remote, sizeof(remote)); +#ifdef INET6 if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&TO_IN6(&peer->remote)->sin6_addr)) { /* V4 mapped address, so treat this as v4, not v6. */ @@ -594,7 +595,6 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) in6_sin6_2_sin_in_sock((struct sockaddr *)&peer->remote); } -#ifdef INET6 if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&TO_IN6(&peer->local)->sin6_addr)) { NET_EPOCH_ENTER(et);