The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c87db4b3c5b119809c7ff12d20ecbfd62f01996
commit 9c87db4b3c5b119809c7ff12d20ecbfd62f01996 Author: John Baldwin <[email protected]> AuthorDate: 2021-05-05 20:59:09 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2021-05-05 20:59:09 +0000 Group all compat shim structures together to consolidate #ifdef's. Reviewed by: brooks, kib Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D29894 --- sys/net/if.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 9b461a15a57a..e444faa54cb0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -149,6 +149,15 @@ CTASSERT(sizeof(struct ifreq) == sizeof(struct ifreq32)); CTASSERT(__offsetof(struct ifreq, ifr_ifru) == __offsetof(struct ifreq32, ifr_ifru)); +struct ifconf32 { + int32_t ifc_len; + union { + uint32_t ifcu_buf; + uint32_t ifcu_req; + } ifc_ifcu; +}; +#define SIOCGIFCONF32 _IOWR('i', 36, struct ifconf32) + struct ifdrv32 { char ifd_name[IFNAMSIZ]; uint32_t ifd_cmd; @@ -2879,16 +2888,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) return (error); } -#ifdef COMPAT_FREEBSD32 -struct ifconf32 { - int32_t ifc_len; - union { - uint32_t ifcu_buf; - uint32_t ifcu_req; - } ifc_ifcu; -}; -#define SIOCGIFCONF32 _IOWR('i', 36, struct ifconf32) -#endif /* * Interface ioctls. */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
