Module Name: src Committed By: pgoyette Date: Sun Jul 17 00:17:14 UTC 2016
Modified Files: src/sys/netsmb: smb_dev.c Log Message: Rather than calling devsw_attach() and ignoring the EEXIST error when the driver is already built-in to the kernel, don't bother calling. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/netsmb/smb_dev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netsmb/smb_dev.c diff -u src/sys/netsmb/smb_dev.c:1.44 src/sys/netsmb/smb_dev.c:1.45 --- src/sys/netsmb/smb_dev.c:1.44 Thu Aug 20 14:40:19 2015 +++ src/sys/netsmb/smb_dev.c Sun Jul 17 00:17:14 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_dev.c,v 1.44 2015/08/20 14:40:19 christos Exp $ */ +/* $NetBSD: smb_dev.c,v 1.45 2016/07/17 00:17:14 pgoyette Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.44 2015/08/20 14:40:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.45 2016/07/17 00:17:14 pgoyette Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -378,19 +378,23 @@ nsmb_modcmd(modcmd_t cmd, void *arg) switch (cmd) { case MODULE_CMD_INIT: nsmbattach(1); +#ifdef _MODULE error = devsw_attach("nsmb", NULL, &bmajor, &nsmb_cdevsw, &cmajor); if (error == EEXIST) /* builtin */ error = 0; +#endif if (error) { nsmbdetach(); } break; case MODULE_CMD_FINI: +#ifdef _MODULE error = devsw_detach(NULL, &nsmb_cdevsw); if (error) break; +#endif nsmbdetach(); break; default: