From nobody Thu Sep 5 19:55:23 2024 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 4X097v2tJKz5TmSK; Thu, 05 Sep 2024 19:55:23 +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 4X097v2M6jz4bf5; Thu, 5 Sep 2024 19:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725566123; 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=pdlmA1ne06i3nv5jaFYfac3M+ZgwAzU9Y3MXtVXIwhM=; b=C+daY4UG0IFJb3TZVF/JOiIHs22I7DXdZ8XzHmw7K/Stuz6HN/O4CszK82wgxvulNSZaW/ 5OPjsSUPk1zyQ58PwgKvg531sFmYR1wDeRM9b38ixnYVFqzulA8SlD09FiJuZjYJwfF4b7 1L1ko8rEZeHoTEfQXJA3mhg+49K7NkdJbJt7BCp6BVAeZYejt3h0MeiLAWZUNStY6HxhLB 8DhBNOxWW2l2NkMjWfYJOKXK+yvTrXTdlD6lRtrO1/QhOrsErs2Z/AdY032qeCEj9UgZYJ YuvYJnwiEX8Si1HxLyeI+mK0bwn9QLZ5jGd1PV+zx6mMXMk4g0Tlnc7Bc8dl9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725566123; a=rsa-sha256; cv=none; b=HQPHb5kQTq4j0ZqVS0TQrrmOCN49rkQkgLIw6h3SGs0Ejirm4xvsAxM2ajc10J+BRNVbl6 6wlm4LGMdcyFWwj3o00sRikxdKZHIXVN8dxyfmlF6wGLGmgO4WwgDWYlvRQqjoRhBlW94X c/ovHSTb7RvijiKeylB4+88Re2nhBtGELSkdyXj4/mNTwq36flGIJMf5QJ6nQ8NBlrws9+ /WNbPX3PxN1/emC48zYZ1FHpoNZf/I3jNsNlqzmLyG2YsjEK8Qj7DgHM037woZ8fqxkSyg Q9dUCvOMJhAWuIjn6pdq3IosT/fBiY7fK1eX+R7mVqyXkdIDx0gDW7O80hASww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725566123; 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=pdlmA1ne06i3nv5jaFYfac3M+ZgwAzU9Y3MXtVXIwhM=; b=MFfOvrmODClG8WsLPryCuMnLljNn+G6HrrSWDZEQBVtjszdvZ1KjdMJF5g2So5femhjBBI 56Ay7H1qw6Vszifwzpo/nCEfay1vZ5N8Sm4cqCkxTNM1B83tstiXhQf0SOvq8UKUHEBUew GOdFTYVvgybTnddx7/aBTvRgL0hhX7XfWxg1Hi3N61T7ctKIw5dvFcYsvZtGaY9g6bugBn bVZF7P/Y12xNpLrR/eOEcr18qMcztR0mBEHbdG0Ms05Wy9zkr3xUucwnAb7FpODd8Z/uEt g0RLEOs6xuQ4rI5I5zmhfKQv/QalMlNgEhTCoac3NucGmIC67XiAuMykmwOSjw== 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 4X097v1yr1zMMd; Thu, 5 Sep 2024 19:55:23 +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 485JtNGH095826; Thu, 5 Sep 2024 19:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485JtNL1095823; Thu, 5 Sep 2024 19:55:23 GMT (envelope-from git) Date: Thu, 5 Sep 2024 19:55:23 GMT Message-Id: <202409051955.485JtNL1095823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ed4d2a54fc7a - main - rc: network.subr update consitency with older change (v6/v4 order) 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed4d2a54fc7a0397c2042f496f176305ca03ebdd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4d2a54fc7a0397c2042f496f176305ca03ebdd commit ed4d2a54fc7a0397c2042f496f176305ca03ebdd Author: Bjoern A. Zeeb AuthorDate: 2024-09-04 19:03:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-05 19:53:57 +0000 rc: network.subr update consitency with older change (v6/v4 order) As of 1b5be7204eaeeaf58eefdebe5b308f90792c693b we setup parts of IPv6 before IPv4 if configured. For consistency change a case in ifn_start() calling ipv6_up() before ipv4_up() and reverse in ifn_stop(). MFC after: 10 days Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D33426 --- libexec/rc/network.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 257643f48ba5..931fbec19a60 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -46,8 +46,8 @@ ifn_start() ifscript_up ${ifn} && cfg=0 ifconfig_up ${ifn} && cfg=0 if ! noafif $ifn; then - afexists inet && ipv4_up ${ifn} && cfg=0 afexists inet6 && ipv6_up ${ifn} && cfg=0 + afexists inet && ipv4_up ${ifn} && cfg=0 fi childif_create ${ifn} && cfg=0 @@ -67,8 +67,8 @@ ifn_stop() [ -z "$ifn" ] && err 1 "ifn_stop called without an interface" if ! noafif $ifn; then - afexists inet6 && ipv6_down ${ifn} && cfg=0 afexists inet && ipv4_down ${ifn} && cfg=0 + afexists inet6 && ipv6_down ${ifn} && cfg=0 fi ifconfig_down ${ifn} && cfg=0 ifscript_down ${ifn} && cfg=0