From owner-svn-src-head@FreeBSD.ORG Thu Sep 18 20:23:35 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17E7FD5A; Thu, 18 Sep 2014 20:23:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBA32E9D; Thu, 18 Sep 2014 20:23:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IKNY9o043400; Thu, 18 Sep 2014 20:23:34 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IKNYLY043399; Thu, 18 Sep 2014 20:23:34 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201409182023.s8IKNYLY043399@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 18 Sep 2014 20:23:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271812 - head/sys/dev/nge X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2014 20:23:35 -0000 Author: glebius Date: Thu Sep 18 20:23:34 2014 New Revision: 271812 URL: http://svnweb.freebsd.org/changeset/base/271812 Log: Mechanically convert to if_inc_counter(). Modified: head/sys/dev/nge/if_nge.c Modified: head/sys/dev/nge/if_nge.c ============================================================================== --- head/sys/dev/nge/if_nge.c Thu Sep 18 20:21:46 2014 (r271811) +++ head/sys/dev/nge/if_nge.c Thu Sep 18 20:23:34 2014 (r271812) @@ -1476,7 +1476,7 @@ nge_rxeof(struct nge_softc *sc) if ((cmdsts & NGE_CMDSTS_MORE) != 0) { if (nge_newbuf(sc, cons) != 0) { - ifp->if_iqdrops++; + if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); if (sc->nge_head != NULL) { m_freem(sc->nge_head); sc->nge_head = sc->nge_tail = NULL; @@ -1526,7 +1526,7 @@ nge_rxeof(struct nge_softc *sc) /* Try conjure up a replacement mbuf. */ if (nge_newbuf(sc, cons) != 0) { - ifp->if_iqdrops++; + if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); if (sc->nge_head != NULL) { m_freem(sc->nge_head); sc->nge_head = sc->nge_tail = NULL; @@ -1563,7 +1563,7 @@ nge_rxeof(struct nge_softc *sc) nge_fixup_rx(m); #endif m->m_pkthdr.rcvif = ifp; - ifp->if_ipackets++; + if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) { /* Do IP checksum checking. */ @@ -1650,15 +1650,15 @@ nge_txeof(struct nge_softc *sc) BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->nge_cdata.nge_tx_tag, txd->tx_dmamap); if ((cmdsts & NGE_CMDSTS_PKT_OK) == 0) { - ifp->if_oerrors++; + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); if ((cmdsts & NGE_TXSTAT_EXCESSCOLLS) != 0) - ifp->if_collisions++; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1); if ((cmdsts & NGE_TXSTAT_OUTOFWINCOLL) != 0) - ifp->if_collisions++; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1); } else - ifp->if_opackets++; + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); - ifp->if_collisions += (cmdsts & NGE_TXSTAT_COLLCNT) >> 16; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (cmdsts & NGE_TXSTAT_COLLCNT) >> 16); KASSERT(txd->tx_m != NULL, ("%s: freeing NULL mbuf!\n", __func__)); m_freem(txd->tx_m); @@ -1730,8 +1730,9 @@ nge_stats_update(struct nge_softc *sc) /* * Since we've accept errored frames exclude Rx length errors. */ - ifp->if_ierrors += stats->rx_pkts_errs + stats->rx_crc_errs + - stats->rx_fifo_oflows + stats->rx_sym_errs; + if_inc_counter(ifp, IFCOUNTER_IERRORS, + stats->rx_pkts_errs + stats->rx_crc_errs + + stats->rx_fifo_oflows + stats->rx_sym_errs); nstats = &sc->nge_stats; nstats->rx_pkts_errs += stats->rx_pkts_errs; @@ -2435,7 +2436,7 @@ nge_watchdog(struct nge_softc *sc) return; ifp = sc->nge_ifp; - ifp->if_oerrors++; + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); if_printf(ifp, "watchdog timeout\n"); ifp->if_drv_flags &= ~IFF_DRV_RUNNING;