From nobody Sat Sep 28 21:52:12 2024 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 4XGLf50c3Nz5Xtcg; Sat, 28 Sep 2024 21:52:13 +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 4XGLf45qjyz44ky; Sat, 28 Sep 2024 21:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727560332; 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=nxiw/HH3wuhg5NVNZZs4RnR3MN3LbDc+H9+DHjrFzCk=; b=H3svt7BrZkRutJBLCeS9R9Li1iZRolf58q7xDQex4Fj4/fizFEQES7ebljLnUQO1nepCYi Q/nWRMNvbAvdbcWhg0HdVKAIR/4EZL0d38rKk2o4y9ZK8iFt8ffQufjgDAQwha554hSNUC nmo3W04cYlkAv2G4KopfhijS9/rjEWPwSJd9hS0WQuUOwRrFKlkXEJkMAkIHG8zPMgmDZn 33d1NQrIu4hy3FKQv7jHTgycF3k0HFSOUnIcW3OMF3yNwT7t/QFb8jz6q/uUmn2lZVwgTB g6hMTASRqKtTNvuf0MJ6EJPdUgmskglHOc5/heaZEyZ97NM+5hnXCa2YzkxXRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727560332; 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=nxiw/HH3wuhg5NVNZZs4RnR3MN3LbDc+H9+DHjrFzCk=; b=ZS8TbMkv3yt85QZJdYKL6EWMEANmnVfaSMkzBNj1euMN83HG6wx/zzlAefkGe896L0GkD4 ziXwYOdzPt3SDKmuLuwBVZU5aSHhLdUE/1x1VNadyB2nBDyoNYUOihxDKiTeE+kEDdbX6e Q5OEiaVIKoMy/ij+/Z3YvW7c13Wrdhf0lIMvgLqUNXcB6jDU94FN2VQFTXf9aZ1XEJY1SU b8yfok7ivZ+a6G7YolKPBKu0CqhpORCIuFsWrYd297cYrn2+3ilFO7C/5Mx8PV34cSV2vH LkPoS5Ednb4iyGCc6HRe/wD3AC4hsf8s1JNLk/04iQceSIO+OzllcNge1jwAWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727560332; a=rsa-sha256; cv=none; b=fS02juls69dwaB8E4dOSQGu8B7Wjztf/0v1mkvlUQdy8i8124myuJXjOJSk92jKkxwBN57 FB8aeIKSUxaR3WWSCMBRY/Zer+gBDmrWxatVALzVyKfYim1C00c3v1QIDT2eb73NKgsF7f qBc33aCX4dcM0x5cbRvLtmLM4Jii5GDqFBiEekVb2laizdM2uiXptXS8Krs3b9LB7xx6Qb 8mhXI5MzDpULd82ioAP453wBo9+mCe+gZC6H5rfFMi20UEkS5hdh3WvPRlyddy1IsooGtB ejcY1BLXcNGFPTSIIVF9Yk+RVdrtjSMwX9e25vuoEQnlY8SHFuU9xRKXwN3n8g== 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 4XGLf45SBKzhmK; Sat, 28 Sep 2024 21:52:12 +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 48SLqC3E051496; Sat, 28 Sep 2024 21:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SLqC6x051493; Sat, 28 Sep 2024 21:52:12 GMT (envelope-from git) Date: Sat, 28 Sep 2024 21:52:12 GMT Message-Id: <202409282152.48SLqC6x051493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 267ad286efd8 - stable/13 - rc: network.subr update consitency with older change (v6/v4 order) 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 267ad286efd8454e08916e0bb30f76954100d379 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=267ad286efd8454e08916e0bb30f76954100d379 commit 267ad286efd8454e08916e0bb30f76954100d379 Author: Bjoern A. Zeeb AuthorDate: 2024-09-04 19:03:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-28 11:07:58 +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(). Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D33426 (cherry picked from commit ed4d2a54fc7a0397c2042f496f176305ca03ebdd) --- 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