diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2021-05-05 20:59:09 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2022-11-10 18:26:14 +0000 |
| commit | 7affe1db37359647cf77ad330f391b506a0dba09 (patch) | |
| tree | 4207c4dce7ef37f5a1eeeb059a3203817aa90c4e | |
| parent | e4f4273d054abeb1c57c4aacb8e9ca962409885d (diff) | |
| download | src-7affe1db37359647cf77ad330f391b506a0dba09.tar.gz src-7affe1db37359647cf77ad330f391b506a0dba09.zip | |
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
(cherry picked from commit 9c87db4b3c5b119809c7ff12d20ecbfd62f01996)
| -rw-r--r-- | sys/net/if.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index ae7b1087c249..1f768ed1d4aa 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -148,6 +148,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; @@ -2900,16 +2909,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. */ |