From nobody Sat Sep 28 10:38:05 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 4XG3hG2Tw5z5X8PZ;
Sat, 28 Sep 2024 10:38:06 +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 4XG3hG0JWrz46mX;
Sat, 28 Sep 2024 10:38:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1727519886;
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=w25uqO8mHEL3yboGbCV7ioUkf64JMjLIRnz6K0etaBA=;
b=sN15J0B5+Ee2ZSA2pMst1QbBNHVmzWcTvvhCN2c5zfJnELUo+/e6xafKJeLJ0JETRtc/4u
FMrx0eQi439Uc6VpUvtBiGrtUCah57dT7quHyFYbAKiXX562EYmnTQyf9505OBn2aB3HSV
GFAUMi0a27ZeCnrJohMnnMese+XbFnp8F3Z2AuRl+hsia6AJKjyBkLg4q2YQzeu2O92/Pj
rKHkidNJLlwIzH7/sYithOPcwsq5crjPTzemSltDUoHUmxFGOe4/1XFPi4Qzc2sLHb6csS
E4pTm2H5tE98M8zfhnkInaaRzByAlsEtWSEeP4+Kahgc/RetDOUzQgToiBKyJA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1727519886;
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=w25uqO8mHEL3yboGbCV7ioUkf64JMjLIRnz6K0etaBA=;
b=B3cheRH/j2AodYc0/IOPXtY4lEY4Y1plWj148sFezTE/3DYWpWtS5q3tyS2q6jQt4llktL
qlxzIV78SdhCOf2XXI3U0GBI6+OpQkTgCfGmGFknNBpUqkQ6lqQjiU+QHSUtCPxVNi2/q8
mbnNkBNPcsRR8Mg/+RoR3aGj8KChq+Q83u08B6M+wv14ZA6R2tPf3DvrGwV71/+dI6wiqe
sG5/LU1oqWX+GdwJF+OCYOxhejGf3tDuDqACCOmlZJnh80T4pwk3f91l9PWYYiBmRVOyrz
mllq1sRLlEKYWpI4jnZUFdZ1417NeaJd80MqnoBzWz1GFd75zJ0B5jooQSo/lA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727519886; a=rsa-sha256; cv=none;
b=X0mDOWIJZ1AEkWpS74rx8JxVhfywkZALaT5tAmBmVQ/LLnvsl9RWDbXe7c4b2yK+xtdCaX
+Djxfzd8jTR8zn7jqd5fKWkZKdQzw2Zx7oFqNvIvqn3y6xysgHj0Nax5o8DU1SYfOjLsQb
GGfn/3aYY1hGlB6hax46gTrycXljypREr921PBIZGDw4qC5kQ8cCvM8FUcxY+e3/744NUn
wYJQdDpS/hSRUiNB7N5u9f6oZVRwNqTrI1ESv78cRu2VXBtvdj4EAAthiaOfiZz+4TFcQr
B/4zk8C5WMgH8PHFBLCQfd+nD5qD5xUmmaeOcidC9oby/dtMAwNY7XXu9VD/7Q==
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 4XG3hF6sS8zLYp;
Sat, 28 Sep 2024 10:38:05 +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 48SAc5hh097395;
Sat, 28 Sep 2024 10:38:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SAc5vE097392;
Sat, 28 Sep 2024 10:38:05 GMT
(envelope-from git)
Date: Sat, 28 Sep 2024 10:38:05 GMT
Message-Id: <202409281038.48SAc5vE097392@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: d60a0ffecfdf - stable/14 - rc: network.subr update
consitency with older change (v6/v4 order)
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/14
X-Git-Reftype: branch
X-Git-Commit: d60a0ffecfdf6f29ff52c9b71d2d5b6d2a34fddb
Auto-Submitted: auto-generated
The branch stable/14 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=d60a0ffecfdf6f29ff52c9b71d2d5b6d2a34fddb
commit d60a0ffecfdf6f29ff52c9b71d2d5b6d2a34fddb
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-09-04 19:03:49 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-09-28 10:35:11 +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