From nobody Thu Oct 29 19:33:25 2026 X-Original-To: dev-commits-src-branches@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 4jFvXk2mDWz6xY1P for ; Thu, 29 Oct 2026 19:33:26 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFvXk0L5Hz4JPv for ; Thu, 29 Oct 2026 19:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793302406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n2DkteewMEi/BUQsGnWnrnWkLdt8WduSPso0uSua9fY=; b=it6o50pdkCdhPAI47nXsDyRagEQ5wWTNGN4Kr1Ch0/qYaQi9I3uLyGF+Dm+5j8RbMhKms9 0ZgDq6a7RTRAuvfSWpGoi1gztxK2M9ReQ33skJvhviLZZSvGllUcGiDNKHZyRj0LTjA1BK KeANdvqiW1UWqmXdkpd1TLe3C9PoFXcFQbm7z3ESxrvWQcH/nN4Ihs8t4LyHkZ1M9cCxfh f8Kfydk55IgA1qvD43GyotLXNX1clTvVtqqKImgVWkJUj27h7M3m7eCF7WmLWSBcBhfNAq 6Xey30nMeQzl4rhUPx1lndXP0eBiv1LW3s3yNr7Nyy/+NEqgAlsYzx8y3Neb8w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793302406; b=f2ZTKEabTNo6wtAwQoGed0ndEDl537QykOtwVGO3je+EyWSDRtE2EKTxZt4/cLnNv7zvwO iZUsc5jZ1ARLjT//LWK1DwEePoGk0P0ne2D+2YmHj790e12NsSJhYf3OMEWfTKU5uCgqwR ySdywcmJ4kOOzmE57mA7Rq5ZlD76i7qZHwOo3HpQddTOTdQqtCY5s09pdKJT66D+jKscAC ID5dOXySgTIcImcXMREVGa+JcKi8TLbsjCxHPQ/siyT+fakbwveG8CePZ4cwXRzJHhvGRc Ui8BW9GcCYW9La1BwpgqqVmyH7QPgMOa/1xN47vaGV1isophZa47zBbe51Fh4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793302406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n2DkteewMEi/BUQsGnWnrnWkLdt8WduSPso0uSua9fY=; b=Ye9kpEWyQ9haQGoECCLS7+dN+UuBidEFuZr81Yu4OG/0oL8Aazo5hui3u1WFNADVammpcA 30b4ZfbnM7HfkAvAbY4y5M3829wxZsuGNdzQJr8I7dKeT4UwIlGvqSXP1xDNXA07HE2Dv5 tzhIV06pzb+rgg/3ZlbScI4r+qbRRlqzmFcKePziRgK+6uQyzvVvZ5xGBe527ZIFhLkfTM l9TgiwegVMIO8QYGhr493h8Aog//BLm1ODAE4wcmgT5d2LsHIbjzyxPKg8UX4uXnfgSURn DN+HyPER1sZXgWdxp6+iEq8MWMwRE5gNX7af9MP6yafsziGdViAR9MCrFKDRfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFvXj6lfHztDv for ; Thu, 29 Oct 2026 19:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 19:33:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: 5bb7e28fd73e - stable/15 - net: Fix collision between SIOCGI2CPB and IPSECGREQID List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5bb7e28fd73ed58722fd853184d2c034b899e97f Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 19:33:25 +0000 Message-Id: <6ae39f85.19d13.18df67ec@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=5bb7e28fd73ed58722fd853184d2c034b899e97f commit 5bb7e28fd73ed58722fd853184d2c034b899e97f Author: Andrew Gallatin AuthorDate: 2026-04-24 20:01:44 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 19:32:03 +0000 net: Fix collision between SIOCGI2CPB and IPSECGREQID It turns out interface ioctls are defined not just in sockio.h, but are spread among many files. When I added SIOCGI2CPB at the bottom of the file, the next number (160) collided with an ioctl (IPSECGREQID) that I was unaware of in another file. Fix this by moving to a number that is unclaimed. Fixes: cf1f21572897 (net: Add SIOCGI2CPB ioctl & add page/bank fields to ifi2creq) Reported by: dhw Reviewed by: imp (cherry picked from commit 5923b363ca616e7cd4fdec1f4f0bf0c98b272468) --- sys/sys/sockio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index de2cc236223c..121acd5ba287 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -99,6 +99,7 @@ #define SIOCSIFLLADDR _IOW('i', 60, struct ifreq) /* set linklevel addr */ #define SIOCGI2C _IOWR('i', 61, struct ifreq) /* get I2C data */ #define SIOCGHWADDR _IOWR('i', 62, struct ifreq) /* get hardware lladdr */ +#define SIOCGI2CPB _IOWR('i', 64, struct ifreq) /* get I2C data*/ #define SIOCSIFPHYADDR _IOW('i', 70, struct ifaliasreq) /* set gif address */ #define SIOCGIFPSRCADDR _IOWR('i', 71, struct ifreq) /* get gif psrc addr */ @@ -150,6 +151,5 @@ #define SIOCGUMBINFO _IOWR('i', 157, struct ifreq) /* get MBIM info */ #define SIOCSUMBPARAM _IOW('i', 158, struct ifreq) /* set MBIM param */ #define SIOCGUMBPARAM _IOWR('i', 159, struct ifreq) /* get MBIM param */ -#define SIOCGI2CPB _IOWR('i', 160, struct ifreq) /* get I2C data */ #endif /* !_SYS_SOCKIO_H_ */