Module Name: src
Committed By: pgoyette
Date: Thu Sep 8 00:07:48 UTC 2016
Modified Files:
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
if_config processing wants to auto-load modules named with an if_ prefix,
while specfc wants to auto-load modules without the prefix. For modules
which can be loaded both ways (ie, if_tap and if_tun), provide a simple
conversion table for specfs so it can auto-load the if_ module.
This table should always be quite small, and the auto-load operation is
relatively infrequent, so the additional overhead of comparing names should
be tolerable.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/miscfs/specfs/spec_vnops.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/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.163 src/sys/miscfs/specfs/spec_vnops.c:1.164
--- src/sys/miscfs/specfs/spec_vnops.c:1.163 Sat Aug 20 12:37:09 2016
+++ src/sys/miscfs/specfs/spec_vnops.c Thu Sep 8 00:07:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.163 2016/08/20 12:37:09 hannken Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.164 2016/09/08 00:07:48 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.163 2016/08/20 12:37:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.164 2016/09/08 00:07:48 pgoyette Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -482,6 +482,16 @@ spec_lookup(void *v)
typedef int (*spec_ioctl_t)(dev_t, u_long, void *, int, struct lwp *);
+struct dev_to_mod {
+ const char *dev_name, *mod_name;
+};
+
+struct dev_to_mod dev_mod_table[] = {
+ { "tap", "if_tap" },
+ { "tun", "if_tun" },
+ { NULL, NULL }
+};
+
/*
* Open a special file.
*/
@@ -505,6 +515,7 @@ spec_open(void *v)
u_int gen;
const char *name;
struct partinfo pi;
+ struct dev_to_mod *conv;
l = curlwp;
vp = ap->a_vp;
@@ -571,6 +582,16 @@ spec_open(void *v)
/* Get device name from devsw_conv array */
if ((name = cdevsw_getname(major(dev))) == NULL)
break;
+
+ /* Check exception table for alternate module name */
+ conv = dev_mod_table;
+ while (conv->dev_name != NULL) {
+ if (strcmp(conv->dev_name, name) == 0) {
+ name = conv->mod_name;
+ break;
+ }
+ conv++;
+ }
/* Try to autoload device module */
(void) module_autoload(name, MODULE_CLASS_DRIVER);
@@ -623,6 +644,16 @@ spec_open(void *v)
VOP_UNLOCK(vp);
+ /* Check exception table for alternate module name */
+ conv = dev_mod_table;
+ while (conv->dev_name != NULL) {
+ if (strcmp(conv->dev_name, name) == 0) {
+ name = conv->mod_name;
+ break;
+ }
+ conv++;
+ }
+
/* Try to autoload device module */
(void) module_autoload(name, MODULE_CLASS_DRIVER);
