From fe753c29f78ca8704799c1c0ad96e403108fc082 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 24 Mar 2005 17:51:15 +0000 Subject: [PATCH] Compile errors are way more useful then panics later. Replace a KASSERT of LINUX_IFNAMSIZ == IFNAMSIZ with a preprocessor check and #error message. This will prevent nasty suprises if users change IFNAMSIZ without updating the linux code appropriatly. --- sys/compat/linux/linux_ioctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 20a2aa92f1b5..89ba36aee775 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -70,6 +70,10 @@ __FBSDID("$FreeBSD$"); #include #include +#if (LINUX_IFNAMSIZ != IFNAMSIZ) +#error "LINUX_IFNAMSIZ != IFNAMSIZ" +#endif + static linux_ioctl_function_t linux_ioctl_cdrom; static linux_ioctl_function_t linux_ioctl_vfat; static linux_ioctl_function_t linux_ioctl_console; @@ -2235,9 +2239,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioctl_args *args) struct file *fp; int error, type; - KASSERT(LINUX_IFNAMSIZ == IFNAMSIZ, - ("%s(): LINUX_IFNAMSIZ != IFNAMSIZ", __func__)); - ifp = NULL; error = 0;