Date: Fri, 24 Apr 2026 20:30:46 +0000 From: Andrew Gallatin <gallatin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5923b363ca61 - main - net: Fix collision between SIOCGI2CPB and IPSECGREQID Message-ID: <69ebd2f6.37611.54446236@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=5923b363ca616e7cd4fdec1f4f0bf0c98b272468 commit 5923b363ca616e7cd4fdec1f4f0bf0c98b272468 Author: Andrew Gallatin <gallatin@FreeBSD.org> AuthorDate: 2026-04-24 20:01:44 +0000 Commit: Andrew Gallatin <gallatin@FreeBSD.org> 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_ */home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ebd2f6.37611.54446236>