diff --git a/UPDATING b/UPDATING --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,15 @@ world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250823: + To restore bridge(4)'s ABI compatibility with ifconfig from 14.x or + earlier, the size of struct ifbreq has changed, so you must update + the kernel and /sbin/ifconfig at the same time or you will not be + able to add interfaces to bridge. This is particularly important + if you require bridge for network access during boot, in which case + you should install the new kernel and the new /sbin/ifconfig prior + to rebooting. + 20250820: The WITHOUT_GSSAPI src.conf knob has been removed. This was already a no-op for MIT Kerberos, so this only affects builds which set diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -159,7 +159,7 @@ uint32_t ifbr_addrexceeded; /* member if addr violations */ ether_vlanid_t ifbr_pvid; /* member if PVID */ uint16_t ifbr_vlanproto; /* member if VLAN protocol */ - uint8_t pad[32]; + uint8_t pad[28]; }; /* BRDGGIFFLAGS, BRDGSIFFLAGS */