diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2023-03-04 09:11:39 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2023-03-04 09:11:39 +0000 |
| commit | 9883961ed5af5f0ade31579e95ac53e8c514faed (patch) | |
| tree | 8cd4377a42f9d5403b90c500000c30690cbd58b7 | |
| parent | d447088d998107dfff30c3ca801ff778a9030270 (diff) | |
| download | src-9883961ed5af5f0ade31579e95ac53e8c514faed.tar.gz src-9883961ed5af5f0ade31579e95ac53e8c514faed.zip | |
linux(4): Drop excess assert that Linux IFNAMSIZ is equal to FreeBSD
While here use _Static_assert() instead of the older CTASSERT().
| -rw-r--r-- | sys/compat/linux/linux.c | 2 | ||||
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 273e2a0295c1..a4df46d7f9a7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <compat/linux/linux_mib.h> #include <compat/linux/linux_util.h> -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); +_Static_assert(LINUX_IFNAMSIZ == IFNAMSIZ, "Linux IFNAMSIZ"); static bool use_real_ifnames = false; SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 839c3a61d647..6d15ecdfa939 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -86,8 +86,6 @@ __FBSDID("$FreeBSD$"); #include <cam/scsi/scsi_sg.h> -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); - #define DEFINE_LINUX_IOCTL_SET(shortname, SHORTNAME) \ static linux_ioctl_function_t linux_ioctl_ ## shortname; \ static struct linux_ioctl_handler shortname ## _handler = { \ |