summaryrefslogtreecommitdiffstats
path: root/sys/dev/hatm
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-10-27 14:38:00 +0000
committerhselasky <hselasky@FreeBSD.org>2014-10-27 14:38:00 +0000
commit1f41d295fba2d409098181fe1212b0bbad862311 (patch)
treeba2736123ed8400baf0cb45744b440c6e0eb456d /sys/dev/hatm
parenta3704ff4d46f150fc2e004a6f0f75c57047b967c (diff)
downloadFreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.zip
FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.tar.gz
MFC r263710, r273377, r273378, r273423 and r273455:
- De-vnet hash sizes and hash masks. - Fix multiple issues related to arguments passed to SYSCTL macros. Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/dev/hatm')
-rw-r--r--sys/dev/hatm/if_hatm.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index b8ad577..b98f76b 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -1311,9 +1311,17 @@ kenv_getuint(struct hatm_softc *sc, const char *var,
*ptr = def;
- if (SYSCTL_ADD_UINT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree),
- OID_AUTO, var, rw ? CTLFLAG_RW : CTLFLAG_RD, ptr, 0, "") == NULL)
- return (ENOMEM);
+ if (rw != 0) {
+ if (SYSCTL_ADD_UINT(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, var,
+ CTLFLAG_RW, ptr, 0, "") == NULL)
+ return (ENOMEM);
+ } else {
+ if (SYSCTL_ADD_UINT(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, var,
+ CTLFLAG_RD, ptr, 0, "") == NULL)
+ return (ENOMEM);
+ }
snprintf(full, sizeof(full), "hw.%s.%s",
device_get_nameunit(sc->dev), var);
OpenPOWER on IntegriCloud