diff options
| author | des <des@FreeBSD.org> | 2004-06-04 22:24:46 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-06-04 22:24:46 +0000 |
| commit | 95045d6bb3e88fc94849464c2a8b6dde619ae6e8 (patch) | |
| tree | eb0e9e532b2112e3edfb04fc65c9b8efa3dee627 /sys/compat | |
| parent | 17b52df3d7ba0c2789f07e8d92f72a03d507f1af (diff) | |
| download | FreeBSD-src-95045d6bb3e88fc94849464c2a8b6dde619ae6e8.zip FreeBSD-src-95045d6bb3e88fc94849464c2a8b6dde619ae6e8.tar.gz | |
Take advantage of the dev sysctl tree.
Approved by: wpaul
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/ndis/kern_ndis.c | 12 | ||||
| -rw-r--r-- | sys/compat/ndis/subr_ndis.c | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index 06b5044..e8a89e7 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -611,6 +611,7 @@ ndis_create_sysctls(arg) TAILQ_INIT(&sc->ndis_cfglist_head); +#if __FreeBSD_version < 502113 /* Create the sysctl tree. */ sc->ndis_tree = SYSCTL_ADD_NODE(&sc->ndis_ctx, @@ -618,6 +619,7 @@ ndis_create_sysctls(arg) device_get_nameunit(sc->ndis_dev), CTLFLAG_RD, 0, device_get_desc(sc->ndis_dev)); +#endif /* Add the driver-specific registry keys. */ vals = sc->ndis_regvals; @@ -628,8 +630,13 @@ ndis_create_sysctls(arg) vals++; continue; } +#if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), +#else + SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), +#endif OID_AUTO, vals->nc_cfgkey, CTLFLAG_RW, vals->nc_val, sizeof(vals->nc_val), @@ -698,7 +705,12 @@ ndis_add_sysctl(arg, key, desc, val, flag) TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link); +#if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), +#else + SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), +#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index 4d96d46..30def31 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -613,7 +613,11 @@ ndis_read_cfg(status, parm, cfg, key, type) * See if registry key is already in a list of known keys * included with the driver. */ +#if __FreeBSD_version < 502113 TAILQ_FOREACH(e, &sc->ndis_ctx, link) { +#else + TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { +#endif oidp = e->entry; if (my_strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { @@ -709,7 +713,11 @@ ndis_write_cfg(status, cfg, key, parm) /* See if the key already exists. */ +#if __FreeBSD_version < 502113 TAILQ_FOREACH(e, &sc->ndis_ctx, link) { +#else + TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { +#endif oidp = e->entry; if (my_strcasecmp(oidp->oid_name, keystr) == 0) { /* Found it, set the value. */ |
