Module Name: src
Committed By: pooka
Date: Fri Dec 17 14:27:34 UTC 2010
Modified Files:
src/sys/netsmb: smb_dev.c
Log Message:
* remove #ifdef nonsense (which caused the lossage in the first place)
* make it a DRIVER so that it autoloads when /dev/nsmb is opened
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.38 src/sys/netsmb/smb_dev.c:1.39
--- src/sys/netsmb/smb_dev.c:1.38 Fri Dec 17 13:24:45 2010
+++ src/sys/netsmb/smb_dev.c Fri Dec 17 14:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.38 2010/12/17 13:24:45 pooka Exp $ */
+/* $NetBSD: smb_dev.c,v 1.39 2010/12/17 14:27:34 pooka Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.38 2010/12/17 13:24:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.39 2010/12/17 14:27:34 pooka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -47,6 +47,7 @@
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/file.h> /* Must come after sys/malloc.h */
+#include <sys/module.h>
#include <sys/mbuf.h>
#include <sys/poll.h>
#include <sys/proc.h>
@@ -356,13 +357,7 @@
return error;
}
-
-#ifdef _MODULE
-
-#include <sys/module.h>
-
-MODULE(MODULE_CLASS_MISC, nsmb, NULL);
-
+MODULE(MODULE_CLASS_DRIVER, nsmb, NULL);
static int
nsmb_modcmd(modcmd_t cmd, void *arg)
{
@@ -394,8 +389,6 @@
return error;
}
-#endif /* _MODULE */
-
/*
* Convert a file descriptor to appropriate smb_share pointer
@@ -441,4 +434,3 @@
*sspp = ssp;
return 0;
}
-
