Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 19 Sep 2014 10:33:23 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r271865 - head/sys/dev/rl
Message-ID:  <201409191033.s8JAXNY4042326@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Fri Sep 19 10:33:23 2014
New Revision: 271865
URL: http://svnweb.freebsd.org/changeset/base/271865

Log:
  Mechanically convert to if_inc_counter().

Modified:
  head/sys/dev/rl/if_rl.c

Modified: head/sys/dev/rl/if_rl.c
==============================================================================
--- head/sys/dev/rl/if_rl.c	Fri Sep 19 10:32:20 2014	(r271864)
+++ head/sys/dev/rl/if_rl.c	Fri Sep 19 10:33:23 2014	(r271865)
@@ -1166,7 +1166,7 @@ rl_rxeof(struct rl_softc *sc)
 		if (!(rxstat & RL_RXSTAT_RXOK) ||
 		    total_len < ETHER_MIN_LEN ||
 		    total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 			rl_init_locked(sc);
 			return (rx_npkts);
@@ -1215,11 +1215,11 @@ rl_rxeof(struct rl_softc *sc)
 		CSR_WRITE_2(sc, RL_CURRXADDR, cur_rx - 16);
 
 		if (m == NULL) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			continue;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		RL_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		RL_LOCK(sc);
@@ -1254,7 +1254,7 @@ rl_txeof(struct rl_softc *sc)
 		    RL_TXSTAT_TX_UNDERRUN|RL_TXSTAT_TXABRT)))
 			break;
 
-		ifp->if_collisions += (txstat & RL_TXSTAT_COLLCNT) >> 24;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & RL_TXSTAT_COLLCNT) >> 24);
 
 		bus_dmamap_sync(sc->rl_cdata.rl_tx_tag, RL_LAST_DMAMAP(sc),
 		    BUS_DMASYNC_POSTWRITE);
@@ -1270,10 +1270,10 @@ rl_txeof(struct rl_softc *sc)
 		    (sc->rl_txthresh < 2016))
 			sc->rl_txthresh += 32;
 		if (txstat & RL_TXSTAT_TX_OK)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		else {
 			int			oldthresh;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if ((txstat & RL_TXSTAT_TXABRT) ||
 			    (txstat & RL_TXSTAT_OUTOFWIN))
 				CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG);
@@ -1897,7 +1897,7 @@ rl_watchdog(struct rl_softc *sc)
 		return;
 
 	device_printf(sc->rl_dev, "watchdog timeout\n");
-	sc->rl_ifp->if_oerrors++;
+	if_inc_counter(sc->rl_ifp, IFCOUNTER_OERRORS, 1);
 
 	rl_txeof(sc);
 	rl_rxeof(sc);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409191033.s8JAXNY4042326>