git: 267ad286efd8 - stable/13 - rc: network.subr update consitency with older change (v6/v4 order)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 28 Sep 2024 21:52:12 UTC
The branch stable/13 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=267ad286efd8454e08916e0bb30f76954100d379
commit 267ad286efd8454e08916e0bb30f76954100d379
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 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