From owner-svn-src-all@FreeBSD.ORG Thu Mar 31 22:50:56 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3655E106566B; Thu, 31 Mar 2011 22:50:56 +0000 (UTC) (envelope-from davidch@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 09E518FC0A; Thu, 31 Mar 2011 22:50:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2VMotXr025178; Thu, 31 Mar 2011 22:50:55 GMT (envelope-from davidch@svn.freebsd.org) Received: (from davidch@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2VMotq8025176; Thu, 31 Mar 2011 22:50:55 GMT (envelope-from davidch@svn.freebsd.org) Message-Id: <201103312250.p2VMotq8025176@svn.freebsd.org> From: David Christensen Date: Thu, 31 Mar 2011 22:50:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220230 - head/sys/dev/bxe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2011 22:50:56 -0000 Author: davidch Date: Thu Mar 31 22:50:55 2011 New Revision: 220230 URL: http://svn.freebsd.org/changeset/base/220230 Log: - Fixed build problem when not useing BXE_DEBUG. MFC after: One week. Modified: head/sys/dev/bxe/if_bxe.c Modified: head/sys/dev/bxe/if_bxe.c ============================================================================== --- head/sys/dev/bxe/if_bxe.c Thu Mar 31 22:40:44 2011 (r220229) +++ head/sys/dev/bxe/if_bxe.c Thu Mar 31 22:50:55 2011 (r220230) @@ -15627,13 +15627,6 @@ bxe_add_sysctls(struct bxe_softc *sc) SYSCTL_CHILDREN(device_get_sysctl_tree(sc->bxe_dev)); struct bxe_eth_stats *estats = &sc->eth_stats; - struct sysctl_oid *queue_node; - struct sysctl_oid_list *queue_list; - -#define QUEUE_NAME_LEN 32 - char namebuf[QUEUE_NAME_LEN]; - - SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "estats_total_bytes_received_hi", CTLFLAG_RD, &estats->total_bytes_received_hi, @@ -15747,28 +15740,36 @@ bxe_add_sysctls(struct bxe_softc *sc) CTLFLAG_RD, &sc->mbuf_alloc_failed, 0, "mbuf cluster allocation failures"); - for (int i = 0; i < sc->num_queues; i++) { - struct bxe_fastpath *fp = &sc->fp[i]; - snprintf(namebuf, QUEUE_NAME_LEN, "fp[%02d]", i); - - queue_node = SYSCTL_ADD_NODE(ctx, children, OID_AUTO, - namebuf, CTLFLAG_RD, NULL, "Queue Name"); - queue_list = SYSCTL_CHILDREN(queue_node); - - SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, - "mbuf_alloc_failed", - CTLFLAG_RD, &fp->mbuf_alloc_failed, - "Mbuf allocation failures"); - - SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, - "mbuf_defrag_attempts", - CTLFLAG_RD, &fp->mbuf_defrag_attempts, - "Mbuf defrag attempts"); - - SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, - "mbuf_defrag_successes", - CTLFLAG_RD, &fp->mbuf_defrag_successes, - "Mbuf defrag successes"); + do() { +#define QUEUE_NAME_LEN 32 + char namebuf[QUEUE_NAME_LEN]; + struct sysctl_oid *queue_node; + struct sysctl_oid_list *queue_list; + + for (int i = 0; i < sc->num_queues; i++) { + struct bxe_fastpath *fp = &sc->fp[i]; + snprintf(namebuf, QUEUE_NAME_LEN, "fp[%02d]", i); + + queue_node = SYSCTL_ADD_NODE(ctx, children, OID_AUTO, + namebuf, CTLFLAG_RD, NULL, "Queue Name"); + queue_list = SYSCTL_CHILDREN(queue_node); + + SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, + "mbuf_alloc_failed", + CTLFLAG_RD, &fp->mbuf_alloc_failed, + "Mbuf allocation failures"); + + SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, + "mbuf_defrag_attempts", + CTLFLAG_RD, &fp->mbuf_defrag_attempts, + "Mbuf defrag attempts"); + + SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, + "mbuf_defrag_successes", + CTLFLAG_RD, &fp->mbuf_defrag_successes, + "Mbuf defrag successes"); + } + } SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "driver_state",