From nobody Fri Feb 27 18:43:29 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 4fMxzj3xNhz6Sxsq for ; Fri, 27 Feb 2026 18:43:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMxzj3Nwgz3JPD for ; Fri, 27 Feb 2026 18:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772217809; 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=JVkLcrdQZ7k5rTkcZAczvdMy2RfCAlVUb0L082+e6yQ=; b=Js2MsrfNmFl8I29+pcFGei/0WaURGZUUYSdVEVBLg1JvqCptrm+S38T9MxWiDeBCQPuS+5 pUlv1RhWU9pnchhglYx46YrBPhFVhvpVNiw4omWUSuj39w0kw5rGzn+l4YfGXrQGs6dWWt flmhUi3AnabA677GDm1X4ylhKwGey7keCQIRSrxrpxklgd/1x6Fsp+Lc6tWir68ZX+Tqqs UDFKjepjsot0hMRBSv+d/FxyF50JZECu8NLIlnRgo6TmfLE7en3YV9PYjPklJG6ZTN0dzH leIQL2AClB0cCZ9lxA5cDwrOYcvmTQDHoF3R5sPftaRqbPjpA6eNgrYoOQihpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772217809; a=rsa-sha256; cv=none; b=Xa3Ftx0VJnruTA695Yu4X20YnUcR/kR4QOQfqK+P4ENM37jdo+jRf39VbcUzL5lnkWce0z ueYRI/9+BtFW4x5H0dRsk7QIshNr/3t1nEsoFUsuDdxpchKINgWk5SGqnEch2BT8ZLMEaL H6sYoK/C7dRW6ZgR3dBpGe7kGJ8Z+xwM0xLtbLZxKz8GuXgXX9CkpgffuCkscu6+w0VjIl ofhl1sP/E1P/Y2agVO2pRD8ILu8Mx7aALzUqb1f2divxLFXghu/AL73NPG3UmnG3zwuotG O+T0j/3SEL5BiSGqwcXIdqei7unLbqJ9g+71Tf65IvtK8xkMfr5FqyOySeXxNw== 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=1772217809; 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=JVkLcrdQZ7k5rTkcZAczvdMy2RfCAlVUb0L082+e6yQ=; b=far2FyLOYODGdFEWFhRa2pEHjd51XNdmqj0HEEv4BOUpCksSSIyWmmxn9qcS15Z4f5sbB4 DPy8KGDWzgtZrmQRzMzvIvy+k2cWzEHw4FqJY8t4RVYBnaj5o7lQ5aj7g5QIfgyz5tJD8Y xmHH17+QjZsryJJceDYiUjaNm+sBQJM0Y2/y9rzkTrlmkKlkM1VSXShv14j9g3woHUYaLA i7Jb/oNy85CcpGB/vLyGrwAQQslf9OKAuuru3VmjgiO+FGsT4YmZHk8Jb347NneqTmRImu vlz1CxN8JZ2V17KalM7Wkx4mxl6mQ/soNzIGdeDBSR4v0AzK1VYBaxX07jxoPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMxzj2pdlzDWl for ; Fri, 27 Feb 2026 18:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46c4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 18:43:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: afbfc2a617ee - main - gre: unbreak LINT-NOINET 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afbfc2a617ee16b4c3bafef869690b594f812690 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 18:43:29 +0000 Message-Id: <69a1e5d1.46c4b.27ac4081@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=afbfc2a617ee16b4c3bafef869690b594f812690 commit afbfc2a617ee16b4c3bafef869690b594f812690 Author: Enji Cooper AuthorDate: 2026-02-26 21:31:25 +0000 Commit: Enji Cooper CommitDate: 2026-02-27 18:43:20 +0000 gre: unbreak LINT-NOINET - Move some of the braces under their respective conditionals to make the statements more self-encapsulated and only define the `aliasreq` union in the event either INET or INET6 is defined. - Fix a copy-paste error: `in_gre_ioctl` should be `in6_gre_ioctl` in the INET6 case. Reported by: tinderbox Fixes: e1e18cc12e68 ("if_gre: Add netlink support with tests") Differential Revision: https://reviews.freebsd.org/D55546 --- sys/net/if_gre.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 758f25ccb859..f8036bf4446d 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -327,10 +327,10 @@ gre_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) #endif } else if (sc->gre_family == AF_INET6) { #ifdef INET6 - if (in_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) + if (in6_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, (const struct in6_addr *)&ifr.ifr_addr); - if (in_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) + if (in6_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, (const struct in6_addr *)&ifr.ifr_dstaddr); #endif @@ -1041,10 +1041,16 @@ static int gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt, struct sockaddr *src, struct sockaddr *dst) { +#if defined(INET) || defined(INET6) union { +#ifdef INET struct in_aliasreq in; +#endif +#ifdef INET6 struct in6_aliasreq in6; +#endif } aliasreq; +#endif int error; /* XXX: this sanity check runs again in in[6]_gre_ioctl */ @@ -1057,16 +1063,18 @@ gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt, sx_xlock(&gre_ioctl_sx); error = in_gre_ioctl(sc, SIOCSIFPHYADDR, (caddr_t)&aliasreq.in); sx_xunlock(&gre_ioctl_sx); + } #endif #ifdef INET6 - } else if (src->sa_family == AF_INET6) { + else if (src->sa_family == AF_INET6) { memcpy(&aliasreq.in6.ifra_addr, src, sizeof(struct sockaddr_in6)); memcpy(&aliasreq.in6.ifra_dstaddr, dst, sizeof(struct sockaddr_in6)); sx_xlock(&gre_ioctl_sx); error = in6_gre_ioctl(sc, SIOCSIFPHYADDR_IN6, (caddr_t)&aliasreq.in6); sx_xunlock(&gre_ioctl_sx); + } #endif - } else + else error = EAFNOSUPPORT; if (error == EADDRNOTAVAIL)