From nobody Thu Feb 13 08:45:08 2025 X-Original-To: dev-commits-src-branches@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 4YtpfD4GZdz5nBlM; Thu, 13 Feb 2025 08:45:08 +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 4YtpfD3hnXz3rWK; Thu, 13 Feb 2025 08:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739436308; 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=is6BRLu41f7H5gKgIbRMp3mFkGvRqp6xf3jGIPYjMxA=; b=WQYOb55oXTpSobI3YIKKymcYbfPQVjYbiuQJG+cda/b1A4cTeGoLUK/utvW1hi5scp3E9n JBbj1xO+62UgfJxWdZRrQLRxvDHbyHiSSPuH1n2AMGYnNaKmD18WyWk8oUUR62210A4vzG PxRrjH3VWtV8nkb/KV1BGw1khKPEbNNgSOdm5StlhRRydKfiUdBGwefe7YjbIz44A4RnhD juG0R+zfeKGBdIsL/0OququmOOju5IW8d+GXjKDp5h1a+fkhLmZtHt296wUx0jgcmp1ObD FoRCTWJwXBCBxahnWuWBDGmd2toqDAXu33o9AC+R9nJjHhkEFitu9wKWNw812Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739436308; 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=is6BRLu41f7H5gKgIbRMp3mFkGvRqp6xf3jGIPYjMxA=; b=tvuac8daT9YoaDRygm3CNSIMBrkTStMo9+BpK6YzSG/AEd51urHcQOzUhpy5labgRr6nIN tvEQ4H8TYHL2Eftc/yk0NrIWeBW+2whUNDbPP+HiTrS/c5X2lIJdQeXryaeBhNK00pXEkc DaoknJBhyWH6Jw1jHsXSZhEWX6ibgFXYgWue//T4FYkRXZAWFqz0hbYSSNaFG1d/wRr+Ue /GW6IThS8OpgzzMf5Owy1ly9Ujrwotfu6gZQcH08Z8rJLfvMjw0EzTCmg9ppifDMDnNBOX vreB9KfkLluTLVO53U8F6iuF8H2MqEBr44uCgupoe5Z9YXaH58G4lbBx6eVs8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739436308; a=rsa-sha256; cv=none; b=sCIjOIoqaCcXpgQVkrHF3N1sJ/LqN9NcUCNI5DC1LVQlwcmVGLQFdPhdhFNZz/xk4OvgRj YayIKQ389fpNr3oMsk6aXOCKsFosnu9eyINW5xFLJH9kJ1G2wAboqKDVSBISOpEJoAZvx5 /gIqoms/r9IREw3awKgJCiO52lJM8JxjWvy5wIBpM+1HiMlMKxC3huY8bE0OuAGDjhrEAK +KN77OI131Wad4WmoOv83yKaNVuaFbO3WcHK04ngWNOngEAQ060xU1m7LBbvFxCtAxWXrt UPj97bJ3zNKskR2d3GX2plYU3HQzYhH1SKNnZJva5d1Eu6FTVYVUJUQ1xKmXYg== 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 4YtpfD33hCzdcC; Thu, 13 Feb 2025 08:45:08 +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 51D8j8ZZ042533; Thu, 13 Feb 2025 08:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D8j8mW042530; Thu, 13 Feb 2025 08:45:08 GMT (envelope-from git) Date: Thu, 13 Feb 2025 08:45:08 GMT Message-Id: <202502130845.51D8j8mW042530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 523548736f46 - stable/14 - if_ovpn: fix module load in NOINET6 kernels List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 523548736f46bfcb307846e12dc9a890fa02f327 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=523548736f46bfcb307846e12dc9a890fa02f327 commit 523548736f46bfcb307846e12dc9a890fa02f327 Author: Kristof Provost AuthorDate: 2025-01-30 11:06:19 +0000 Commit: Kristof Provost CommitDate: 2025-02-13 08:44:58 +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 de7920981027..6309d1f365cf 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -593,6 +593,7 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) free(name, M_SONAME); name = NULL; +#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. */ @@ -600,7 +601,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);