From nobody Sat Feb 7 12:49:52 2026 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 4f7W4w5Smhz6Pmfm for ; Sat, 07 Feb 2026 12:49:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7W4w3207z3WbS for ; Sat, 07 Feb 2026 12:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770468592; 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=ofpTFrrCklvO9cLM5E2VEunXcvBNvKsGAmGIjFkuOTw=; b=brDXP92P+cVPiW9Hdw5WZhqi4V/jYFrQMrtrzeH9/G+hNYaVpEHnQnVxKUQkVd2xzOaa+A pFucD3R8TEuCXVty4kkSqb+J7kVeMz+eCF8HmYj+lEPFc5kvVYlJrCgP4/8j6EELx06hPF 484zCjxN7Apbl/sIGz9yY6otoU2iAGoVbVAfCEh9edlompR0dF3/zLznWSFmUN9O4eWJNd MixETHdwwHyec8XLvt1oXNqFNvVsGRzxUG/ldGRt4dIqVZPUsTdeb0sJBwHV8T7D4zj5OW 1HVTjPwGrq/blW37rcmi3MJ1MrKhrP6A1yfjizQvMIBqO8E+sB/dOV6X69TSVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770468592; a=rsa-sha256; cv=none; b=ChtXzq2Bcopd3ZoOcbl5+cQ1sdY59kxGoIVBxfTUNfe57HDpN3gWBvBjbYF8SYQU3sARnk qpk6aIG0pN3F/EdAkqhZSZ3IoTWjM0415KhwdFpga+U/CmQ6gqqDrP2QeSXiIP+YTtDHZC BaObxDZy4dNz85+511OgjDjXLm91bZmpkHkxEm1n0JslWFYSURM7TkK22pI+RLpmFE76yJ O65jcbNnVs0tJ9FJb6+bKI2+NxAzTavzVBlYvCBnhbxKmvkdTW5qS8Lak1QvBPC3kmRE0j s/KjIU/JZaHcsGbIireEf5cVafbDcYgn1h4r2BNkNYiMQBYnGVgQhI3KyXQSdg== 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=1770468592; 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=ofpTFrrCklvO9cLM5E2VEunXcvBNvKsGAmGIjFkuOTw=; b=iDF1H0pwbiZar9OsqYPkqlXGvt5+gJXYfLBZh4RPZk5SPqUfp3hF49WMJcUBkLvzNEX2ZT HCOTeHDKWrsLeklUpykI/Uk9BTOfykieGEQWp3YGFDQnZeR2GvEu2qOQR5fcpYE7kjJtfl nAHkZ8NvxJsOTWGxKG+0cHC3B7IBKec1Up2ckASFwAW4b2v8VWVnjSZLo29HOGJ1H5sp0z Jga9zNS2T9U7tGUuCKvxGgNdigTwni4lj0gASoHpDZq42GFN8gl+IA9NXCuYmWDI46Unmr 3srFMcjky2ZZk35IT4YJKXZ8dkH3rsphL13A7YG7I9OlbfnqO1T1NZJFSd9ZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7W4w2M1qz11xb for ; Sat, 07 Feb 2026 12:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3791d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 12:49:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: 4548149a8102 - main - netinet6: Fix my style issues 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: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 12:49:52 +0000 Message-Id: <698734f0.3791d.631908c8@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=4548149a81026ad9b1706b2b7e7ad47a4c1358b6 commit 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 Author: Guido Falsi AuthorDate: 2026-02-07 12:46:05 +0000 Commit: Guido Falsi CommitDate: 2026-02-07 12:46:05 +0000 netinet6: Fix my style issues Reported by: pouria Reviewed by: pouria, ziaee, glebius Approved by: glebius Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 Differential Revision: https://reviews.freebsd.org/D55136 --- sbin/ifconfig/ifconfig.8 | 19 +++++++++++-------- sys/netinet6/in6_ifattach.c | 22 +++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 627b7cd3f9e3..e1d153aa7493 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1008,24 +1008,28 @@ Set a flag to disable Duplicate Address Detection. Clear a flag .Cm no_dad . .It Cm stableaddr -Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 -The +Set a flag to create SLAAC addresses using a stable algorithm +according to RFC 7217. The .Xr sysctl 8 variable .Va net.inet6.ip6.use_stableaddr -controls whether this flag is set by default or not for newly created interfaces. -To get consistent defaults for interfaces created at boot it should be set as a tunable via loader.conf(8). +controls whether this flag is set by default +or not for newly created interfaces. +To get consistent defaults for interfaces created at boot +it should be set as a tunable via +.Xr loader.conf 8 . The .Xr sysctl 8 variable .Va net.inet6.ip6.stableaddr_maxretries -sets the maximum number of retries to generate a unique IPv6 address to be performed in case of DAD failures. +sets the maximum number of retries to generate a unique IPv6 address +to be performed in case of DAD failures. This defaults to 3 which is also the reccommended minimum value. The interface ID source can be configured using the .Xr sysctl 8 variable -.Va net.inet6.ip6.stableaddr_netifsource: -.Bl -tag -compact +.Va net.inet6.ip6.stableaddr_netifsource : +.Bl -tag -compact -width indent .It Cm 0 uses the interface name string (the default) .It Cm 1 @@ -1033,7 +1037,6 @@ uses the interface ID .It Cm 2 uses the MAC address of the interface (if one can be obtained for it) .El -.Pp .It Cm -stableaddr Clear the flag .Cm stableaddr . diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index c38fe90632f8..a952192b6b62 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -158,7 +158,7 @@ get_rand_ifid(struct ifnet *ifp, struct in6_addr *in6) } -/** +/* * Get interface link level sockaddr */ static struct sockaddr_dl * @@ -178,10 +178,10 @@ get_interface_link_level(struct ifnet *ifp) if (sdl->sdl_alen == 0) continue; - return sdl; + return (sdl); } - return NULL; + return (NULL); } /* @@ -250,10 +250,10 @@ in6_get_interface_hwaddr(struct ifnet *ifp, size_t *len) return (NULL); } - return addr; + return (addr); } - /* +/* * Get interface identifier for the specified interface. * XXX assumes single sockaddr_dl (AF_LINK address) per an interface * @@ -268,7 +268,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) hwaddr = in6_get_interface_hwaddr(ifp, &hwaddr_len); if (hwaddr == NULL || (hwaddr_len != 6 && hwaddr_len != 8)) - return -1; + return (-1); /* make EUI64 address */ if (hwaddr_len == 8) @@ -314,7 +314,7 @@ validate_ifid(uint8_t *iid) static uint8_t reserved_eth[5] = { 0x02, 0x00, 0x5E, 0xFF, 0xFE }; static uint8_t reserved_anycast[7] = { 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - /* Subnet-Router Anycast (RFC 4291)*/ + /* Subnet-Router Anycast (RFC 4291) */ if (memcmp(iid, allzero, 8) == 0) return (false); @@ -375,7 +375,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) /* Use hostuuid as constant "secret" key */ getcredhostuuid(curthread->td_ucred, hostuuid, sizeof(hostuuid)); if (strncmp(hostuuid, DEFAULT_HOSTUUID, sizeof(hostuuid)) == 0) { - // If hostuuid is not set, use a random value + /* If hostuuid is not set, use a random value */ arc4rand(hostuuid, HOSTUUIDLEN, 0); hostuuid[HOSTUUIDLEN] = '\0'; } @@ -383,11 +383,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) dad_failures = atomic_load_int(&DAD_FAILURES(ifp)); - /* - * RFC 7217 section 7 - * - * default max retries - */ + /* RFC 7217 section 7, default max retries */ if (dad_failures > V_ip6_stableaddr_maxretries) return (false);