Re: git: 5923b363ca61 - main - net: Fix collision between SIOCGI2CPB and IPSECGREQID

From: Drew Gallatin <gallatin_at_freebsd.org>
Date: Fri, 24 Apr 2026 20:39:06 UTC

On Fri, Apr 24, 2026, at 4:30 PM, Andrew Gallatin wrote:
> 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
> 

Note that the main consequence of this collision is mce whining in dmesg, so I didn't feel it warranted a FreeBSD version bump.