diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2014-09-18 20:58:04 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2014-09-18 20:58:04 +0000 |
| commit | eed9bc6a5b0981e160fc2ba3bdfd789f16fe4cca (patch) | |
| tree | 8be60e37b5142922355774e9f4ead8daac1d2274 /sys/dev/ffec | |
| parent | 884c5b4544c3d17ac0f40149e767907ade320112 (diff) | |
| download | src-eed9bc6a5b0981e160fc2ba3bdfd789f16fe4cca.tar.gz src-eed9bc6a5b0981e160fc2ba3bdfd789f16fe4cca.zip | |
Mechanically convert to if_inc_counter().
Notes
Notes:
svn path=/head/; revision=271826
Diffstat (limited to 'sys/dev/ffec')
| -rw-r--r-- | sys/dev/ffec/if_ffec.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c index ce8b43537b13..b8230164367d 100644 --- a/sys/dev/ffec/if_ffec.c +++ b/sys/dev/ffec/if_ffec.c @@ -499,23 +499,21 @@ ffec_harvest_stats(struct ffec_softc *sc) sc->stats_harvest_count = 0; ifp = sc->ifp; - ifp->if_ipackets += RD4(sc, FEC_RMON_R_PACKETS); - ifp->if_imcasts += RD4(sc, FEC_RMON_R_MC_PKT); - ifp->if_ierrors += RD4(sc, FEC_RMON_R_CRC_ALIGN); - ifp->if_ierrors += RD4(sc, FEC_RMON_R_UNDERSIZE); - ifp->if_ierrors += RD4(sc, FEC_RMON_R_OVERSIZE); - ifp->if_ierrors += RD4(sc, FEC_RMON_R_FRAG); - ifp->if_ierrors += RD4(sc, FEC_RMON_R_JAB); - - ifp->if_opackets += RD4(sc, FEC_RMON_T_PACKETS); - ifp->if_omcasts += RD4(sc, FEC_RMON_T_MC_PKT); - ifp->if_oerrors += RD4(sc, FEC_RMON_T_CRC_ALIGN); - ifp->if_oerrors += RD4(sc, FEC_RMON_T_UNDERSIZE); - ifp->if_oerrors += RD4(sc, FEC_RMON_T_OVERSIZE ); - ifp->if_oerrors += RD4(sc, FEC_RMON_T_FRAG); - ifp->if_oerrors += RD4(sc, FEC_RMON_T_JAB); - - ifp->if_collisions += RD4(sc, FEC_RMON_T_COL); + if_inc_counter(ifp, IFCOUNTER_IPACKETS, RD4(sc, FEC_RMON_R_PACKETS)); + if_inc_counter(ifp, IFCOUNTER_IMCASTS, RD4(sc, FEC_RMON_R_MC_PKT)); + if_inc_counter(ifp, IFCOUNTER_IERRORS, + RD4(sc, FEC_RMON_R_CRC_ALIGN) + RD4(sc, FEC_RMON_R_UNDERSIZE) + + RD4(sc, FEC_RMON_R_OVERSIZE) + RD4(sc, FEC_RMON_R_FRAG) + + RD4(sc, FEC_RMON_R_JAB)); + + if_inc_counter(ifp, IFCOUNTER_OPACKETS, RD4(sc, FEC_RMON_T_PACKETS)); + if_inc_counter(ifp, IFCOUNTER_OMCASTS, RD4(sc, FEC_RMON_T_MC_PKT)); + if_inc_counter(ifp, IFCOUNTER_OERRORS, + RD4(sc, FEC_RMON_T_CRC_ALIGN) + RD4(sc, FEC_RMON_T_UNDERSIZE) + + RD4(sc, FEC_RMON_T_OVERSIZE) + RD4(sc, FEC_RMON_T_FRAG) + + RD4(sc, FEC_RMON_T_JAB)); + + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, RD4(sc, FEC_RMON_T_COL)); ffec_clear_stats(sc); } @@ -784,7 +782,7 @@ ffec_rxfinish_onebuf(struct ffec_softc *sc, int len) * mbuf, which is still mapped and loaded. */ if ((newmbuf = ffec_alloc_mbufcl(sc)) == NULL) { - ++sc->ifp->if_iqdrops; + if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1); ffec_setup_rxdesc(sc, sc->rx_idx, sc->rxdesc_ring[sc->rx_idx].buf_paddr); return; |