From 60c9c7dd693c94d800510711dbef8459d3563d5a Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 29 Nov 2014 21:48:44 +0100 Subject: [PATCH] kernel/bge: Fix a wrong conversion to the automatic sysctx ctx/tree setup. Reported-by: ivadasz --- sys/dev/netif/bge/if_bge.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c index 573abfd124..f0af838fcd 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -2029,7 +2029,7 @@ bge_attach(device_t dev) struct ifnet *ifp; struct bge_softc *sc; struct sysctl_ctx_list *ctx; - struct sysctl_oid_list *tree; + struct sysctl_oid *tree; uint32_t hwcfg = 0, misccfg; int error = 0, rid, capmask; uint8_t ether_addr[ETHER_ADDR_LEN]; @@ -2594,26 +2594,26 @@ again: } ctx = device_get_sysctl_ctx(sc->bge_dev); - tree = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->bge_dev)); + tree = device_get_sysctl_tree(sc->bge_dev); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "rx_coal_ticks", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "rx_coal_ticks", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_rx_coal_ticks, "I", "Receive coalescing ticks (usec)."); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "tx_coal_ticks", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_coal_ticks", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_tx_coal_ticks, "I", "Transmit coalescing ticks (usec)."); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "rx_coal_bds", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "rx_coal_bds", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_rx_coal_bds, "I", "Receive max coalesced BD count."); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "tx_coal_bds", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_coal_bds", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_tx_coal_bds, "I", "Transmit max coalesced BD count."); - SYSCTL_ADD_INT(ctx, tree, OID_AUTO, "tx_wreg", CTLFLAG_RW, + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_wreg", CTLFLAG_RW, &sc->bge_tx_wreg, 0, "# of segments before writing to hardware register"); @@ -2634,29 +2634,29 @@ again: * consumes a lot of CPU cycles, so leave it off by * default. */ - SYSCTL_ADD_INT(ctx, tree, OID_AUTO, + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "force_defrag", CTLFLAG_RW, &sc->bge_force_defrag, 0, "Force defragment on TX path"); } if (sc->bge_flags & BGE_FLAG_STATUS_TAG) { if (!BGE_IS_5705_PLUS(sc)) { - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "rx_coal_ticks_int", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_rx_coal_ticks_int, "I", "Receive coalescing ticks " "during interrupt (usec)."); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_coal_ticks_int", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_tx_coal_ticks_int, "I", "Transmit coalescing ticks " "during interrupt (usec)."); } - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "rx_coal_bds_int", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_rx_coal_bds_int, "I", "Receive max coalesced BD count during interrupt."); - SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_coal_bds_int", CTLTYPE_INT | CTLFLAG_RW, sc, 0, bge_sysctl_tx_coal_bds_int, "I", "Transmit max coalesced BD count during interrupt."); @@ -2671,7 +2671,7 @@ again: #ifdef IFPOLL_ENABLE /* Polling setup */ - ifpoll_compat_setup(&sc->bge_npoll, ctx, (struct sysctl_oid *)tree, + ifpoll_compat_setup(&sc->bge_npoll, ctx, tree, device_get_unit(dev), ifp->if_serializer); #endif -- 2.41.0