From nobody Fri Apr 24 20:30:46 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 4g2Pjf24Jzz6bCnQ for ; Fri, 24 Apr 2026 20:30:46 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2Pjf1S8fz3Swb for ; Fri, 24 Apr 2026 20:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777062646; 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=j560OEzd/ua7TnLyo/3V1X9aXGNlZww2oSrz9VkgYEs=; b=OBW8YIyVpHYd0fysY/nh1qjQxCncA+q8LYWnBf8u/giQ9er+27vWCBz/ls+Jfk6pQwVACw ptAkzYPCMTIcWc8Qvpg+VwSvuNusgsY4eXQbes8s0w0RB223DixO/KbU3wVtN+fNMtSPLM gvMzd3yVeupLE2bF/Tu+dNQ2ChbWmIdXNZqlvAXEKYb5jY750f3PUuBqvnPpYuhtlyByb8 smDj31wHMYEZfb6p4xPvR0N0RGcYEU8wjAPJNVreABq8YRE1EX8IzXP6sLeleIqheQcGqA X56fyBZC4Qn5mxGa5d4OKo5tTEyLN+1a10n7kyH3yjrMRN9NjcK31gijw/YbHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777062646; a=rsa-sha256; cv=none; b=if+sq/fILZAnOljEV4nuhF1MzS1qb/g9AqcyrdAVveilN5Pn4MguQR3fbZyZ5SyD9T74+V 0KJQaglVmHsDC5eJVxzm1Qu18JleJhIDJHHc6lTgrKEWg1LmbfXcVSPehVifewdGPMGEI5 86NEEgAylWcpWulwt8cMnR6qoa0syfvXDQU0tJLjOKQhtSgQdXuvebBGfL3sMGxFvKVK8N 0rTx8tYwMuUUsXsz1vtVKSsbzLS8CY4g5Om3VtB07h4cZICXEIuDu9DKCGGMF8k+IUYwt/ QIM+jbNIJx36gxCK4bWdL1t1jU1Auger9Nsk1c/+2mFEDGRFGJd7fI6xxplYLA== 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=1777062646; 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=j560OEzd/ua7TnLyo/3V1X9aXGNlZww2oSrz9VkgYEs=; b=wxeADhQsJOxnCYYUrQZRqWlw8MW7HPtJ3tiehhTSLal47cLPWBeK7ykpWPgoyHxcgzoL5Q ZCtIG9AXAN9tD2Hk7Lx7in2my4wU49WDwpin5k99PEQH5HrmxdSD0PzzcStjBpqqvsI5zM gocRSRrLY8cMtDT8rFpTJsV16OnWbkUyhdLc++6ts4dQdfAsqzAysR1j/ZY1TVHcGmzFI6 PqnsIcUfeEC1/BV2RyqCXKABuhVT+NTDUQTAkABu5t50kmZFNc7AlpbWAKVUnbpgpVr1fx SvV5jkIneHtT+xAHdsg+GKAJy6tiaNZGKg0grojBtV/9Up3leHITqk3dDlvFtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2Pjf0tV5z1HcX for ; Fri, 24 Apr 2026 20:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37611 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 20:30:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 5923b363ca61 - main - net: Fix collision between SIOCGI2CPB and IPSECGREQID 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5923b363ca616e7cd4fdec1f4f0bf0c98b272468 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 20:30:46 +0000 Message-Id: <69ebd2f6.37611.54446236@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=5923b363ca616e7cd4fdec1f4f0bf0c98b272468 commit 5923b363ca616e7cd4fdec1f4f0bf0c98b272468 Author: Andrew Gallatin AuthorDate: 2026-04-24 20:01:44 +0000 Commit: Andrew Gallatin CommitDate: 2026-04-24 20:30:24 +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 --- 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_ */