Index: arch/armv7/imx/if_fec.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/if_fec.c,v retrieving revision 1.19 diff -u -p -r1.19 if_fec.c --- arch/armv7/imx/if_fec.c 21 Oct 2016 22:34:00 -0000 1.19 +++ arch/armv7/imx/if_fec.c 22 Jan 2017 06:51:36 -0000 @@ -811,8 +811,6 @@ fec_start(struct ifnet *ifp) ifq_deq_commit(&ifp->if_snd, m_head); - ifp->if_opackets++; - #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m_head, BPF_DIRECTION_OUT); Index: arch/armv7/omap/if_cpsw.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/if_cpsw.c,v retrieving revision 1.41 diff -u -p -r1.41 if_cpsw.c --- arch/armv7/omap/if_cpsw.c 2 Oct 2016 23:38:32 -0000 1.41 +++ arch/armv7/omap/if_cpsw.c 22 Jan 2017 06:51:36 -0000 @@ -1200,8 +1200,6 @@ cpsw_txintr(void *arg) m_freem(rdp->tx_mb[sc->sc_txhead]); rdp->tx_mb[sc->sc_txhead] = NULL; - ifp->if_opackets++; - handled = true; ifq_clr_oactive(&ifp->if_snd); Index: arch/armv7/sunxi/sxie.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/sunxi/sxie.c,v retrieving revision 1.24 diff -u -p -r1.24 sxie.c --- arch/armv7/sunxi/sxie.c 21 Jan 2017 08:26:49 -0000 1.24 +++ arch/armv7/sunxi/sxie.c 22 Jan 2017 06:51:36 -0000 @@ -440,10 +440,6 @@ sxie_intr(void *arg) if (pending & (SXIE_TX_FIFO0 | SXIE_TX_FIFO1)) { ifq_clr_oactive(&ifp->if_snd); - if (pending & SXIE_TX_FIFO0) - ifp->if_opackets++; - if (pending & SXIE_TX_FIFO1) - ifp->if_opackets++; sc->txf_inuse &= ~pending; if (sc->txf_inuse == 0) ifp->if_timer = 0; Index: arch/macppc/dev/if_bm.c =================================================================== RCS file: /cvs/src/sys/arch/macppc/dev/if_bm.c,v retrieving revision 1.40 diff -u -p -r1.40 if_bm.c --- arch/macppc/dev/if_bm.c 13 Apr 2016 11:34:00 -0000 1.40 +++ arch/macppc/dev/if_bm.c 22 Jan 2017 06:51:36 -0000 @@ -484,7 +484,6 @@ bmac_intr(void *v) if (stat & IntFrameSent) { ifq_clr_oactive(&ifp->if_snd); ifp->if_timer = 0; - ifp->if_opackets++; bmac_start(ifp); } @@ -633,7 +632,6 @@ bmac_start(struct ifnet *ifp) /* 5 seconds to watch for failing to transmit */ ifp->if_timer = 5; - ifp->if_opackets++; /* # of pkts */ bmac_transmit_packet(sc, sc->sc_txbuf_pa, tlen); } Index: arch/macppc/dev/if_mc.c =================================================================== RCS file: /cvs/src/sys/arch/macppc/dev/if_mc.c,v retrieving revision 1.28 diff -u -p -r1.28 if_mc.c --- arch/macppc/dev/if_mc.c 13 Apr 2016 11:34:00 -0000 1.28 +++ arch/macppc/dev/if_mc.c 22 Jan 2017 06:51:36 -0000 @@ -570,8 +570,6 @@ mc_start(struct ifnet *ifp) */ ifq_set_oactive(&ifp->if_snd); maceput(sc, m); - - ifp->if_opackets++; /* # of pkts */ } } Index: arch/octeon/dev/cn30xxgmx.c =================================================================== RCS file: /cvs/src/sys/arch/octeon/dev/cn30xxgmx.c,v retrieving revision 1.31 diff -u -p -r1.31 cn30xxgmx.c --- arch/octeon/dev/cn30xxgmx.c 26 Nov 2016 15:36:10 -0000 1.31 +++ arch/octeon/dev/cn30xxgmx.c 22 Jan 2017 06:51:36 -0000 @@ -1323,8 +1323,6 @@ cn30xxgmx_stats(struct cn30xxgmx_port_so (uint32_t)_GMX_PORT_RD8(sc, GMX0_RX0_STATS_PKTS_BAD); ifp->if_iqdrops += (uint32_t)_GMX_PORT_RD8(sc, GMX0_RX0_STATS_PKTS_DRP); - ifp->if_opackets += - (uint32_t)_GMX_PORT_RD8(sc, GMX0_TX0_STAT3); tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT0); ifp->if_oerrors += (uint32_t)tmp + ((uint32_t)(tmp >> 32) * 16); Index: arch/sgi/dev/if_iec.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/dev/if_iec.c,v retrieving revision 1.22 diff -u -p -r1.22 if_iec.c --- arch/sgi/dev/if_iec.c 29 Nov 2016 10:22:30 -0000 1.22 +++ arch/sgi/dev/if_iec.c 22 Jan 2017 06:51:36 -0000 @@ -1354,7 +1354,6 @@ iec_txintr(struct iec_softc *sc, uint32_ } else { ifp->if_collisions += IOC3_ENET_TCDC_COLLISION_MASK & bus_space_read_4(st, sh, IOC3_ENET_TCDC); - ifp->if_opackets++; } } Index: arch/sgi/dev/if_mec.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/dev/if_mec.c,v retrieving revision 1.36 diff -u -p -r1.36 if_mec.c --- arch/sgi/dev/if_mec.c 13 Apr 2016 11:34:00 -0000 1.36 +++ arch/sgi/dev/if_mec.c 22 Jan 2017 06:51:36 -0000 @@ -1371,7 +1371,6 @@ mec_txintr(struct mec_softc *sc, uint32_ col = (txstat & MEC_TXSTAT_COLCNT) >> MEC_TXSTAT_COLCNT_SHIFT; ifp->if_collisions += col; - ifp->if_opackets++; } } Index: arch/sgi/hpc/if_sq.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/hpc/if_sq.c,v retrieving revision 1.27 diff -u -p -r1.27 if_sq.c --- arch/sgi/hpc/if_sq.c 29 Nov 2016 10:22:30 -0000 1.27 +++ arch/sgi/hpc/if_sq.c 22 Jan 2017 06:51:36 -0000 @@ -1319,7 +1319,6 @@ sq_txring_hpc1(struct sq_softc *sc) m_freem(sc->sc_txmbuf[i]); sc->sc_txmbuf[i] = NULL; - ifp->if_opackets++; sc->sc_nfreetx++; SQ_TRACE(SQ_DONE_DMA, sc, i, status); @@ -1407,7 +1406,6 @@ sq_txring_hpc3(struct sq_softc *sc) m_freem(sc->sc_txmbuf[i]); sc->sc_txmbuf[i] = NULL; - ifp->if_opackets++; sc->sc_nfreetx++; SQ_TRACE(SQ_DONE_DMA, sc, i, status); Index: arch/socppc/dev/if_tsec.c =================================================================== RCS file: /cvs/src/sys/arch/socppc/dev/if_tsec.c,v retrieving revision 1.43 diff -u -p -r1.43 if_tsec.c --- arch/socppc/dev/if_tsec.c 13 Apr 2016 11:34:00 -0000 1.43 +++ arch/socppc/dev/if_tsec.c 22 Jan 2017 06:51:36 -0000 @@ -824,7 +824,6 @@ tsec_tx_proc(struct tsec_softc *sc) m_freem(txb->tb_m); txb->tb_m = NULL; - ifp->if_opackets++; } ifq_clr_oactive(&ifp->if_snd); Index: arch/sparc64/dev/vnet.c =================================================================== RCS file: /cvs/src/sys/arch/sparc64/dev/vnet.c,v retrieving revision 1.57 diff -u -p -r1.57 vnet.c --- arch/sparc64/dev/vnet.c 15 Sep 2016 02:00:17 -0000 1.57 +++ arch/sparc64/dev/vnet.c 22 Jan 2017 06:51:36 -0000 @@ -763,7 +763,6 @@ vnet_rx_vio_desc_data(struct vnet_softc pool_put(&sc->sc_pool, sc->sc_vsd[cons].vsd_buf); sc->sc_vsd[cons].vsd_buf = NULL; - ifp->if_opackets++; sc->sc_tx_cons++; break; @@ -877,7 +876,6 @@ vnet_rx_vio_dring_data(struct vnet_softc pool_put(&sc->sc_pool, sc->sc_vsd[cons].vsd_buf); sc->sc_vsd[cons].vsd_buf = NULL; - ifp->if_opackets++; sc->sc_vd->vd_desc[cons].hdr.dstate = VIO_DESC_FREE; sc->sc_tx_cons++; Index: dev/ic/acx.c =================================================================== RCS file: /cvs/src/sys/dev/ic/acx.c,v retrieving revision 1.119 diff -u -p -r1.119 acx.c --- dev/ic/acx.c 2 Sep 2016 09:04:56 -0000 1.119 +++ dev/ic/acx.c 22 Jan 2017 06:51:36 -0000 @@ -1178,8 +1178,7 @@ acx_txeof(struct acx_softc *sc) if (error) { acx_txerr(sc, error); ifp->if_oerrors++; - } else - ifp->if_opackets++; + } /* Update rate control statistics for the node */ if (buf->tb_node != NULL) { Index: dev/ic/aic6915.c =================================================================== RCS file: /cvs/src/sys/dev/ic/aic6915.c,v retrieving revision 1.21 diff -u -p -r1.21 aic6915.c --- dev/ic/aic6915.c 13 Apr 2016 10:49:26 -0000 1.21 +++ dev/ic/aic6915.c 22 Jan 2017 06:51:36 -0000 @@ -865,8 +865,6 @@ sf_stats_update(struct sf_softc *sc) sf_genreg_write(sc, SF_STATS_BASE + (i * sizeof(uint32_t)), 0); } - ifp->if_opackets += stats.TransmitOKFrames; - ifp->if_collisions += stats.SingleCollisionFrames + stats.MultipleCollisionFrames; Index: dev/ic/am7990.c =================================================================== RCS file: /cvs/src/sys/dev/ic/am7990.c,v retrieving revision 1.52 diff -u -p -r1.52 am7990.c --- dev/ic/am7990.c 25 Nov 2015 03:09:58 -0000 1.52 +++ dev/ic/am7990.c 22 Jan 2017 06:51:36 -0000 @@ -355,7 +355,6 @@ am7990_tint(struct lance_softc *sc) else if (tmd.tmd1_bits & LE_T1_MORE) /* Real number is unknown. */ ifp->if_collisions += 2; - ifp->if_opackets++; } if (++bix == sc->sc_ntbuf) Index: dev/ic/am79900.c =================================================================== RCS file: /cvs/src/sys/dev/ic/am79900.c,v retrieving revision 1.6 diff -u -p -r1.6 am79900.c --- dev/ic/am79900.c 25 Nov 2015 03:09:58 -0000 1.6 +++ dev/ic/am79900.c 22 Jan 2017 06:51:36 -0000 @@ -382,7 +382,6 @@ am79900_tint(struct lance_softc *sc) else if (tmd.tmd1 & LE_T1_MORE) /* Real number is unknown. */ ifp->if_collisions += 2; - ifp->if_opackets++; } if (++bix == sc->sc_ntbuf) Index: dev/ic/an.c =================================================================== RCS file: /cvs/src/sys/dev/ic/an.c,v retrieving revision 1.71 diff -u -p -r1.71 an.c --- dev/ic/an.c 13 Apr 2016 10:49:26 -0000 1.71 +++ dev/ic/an.c 22 Jan 2017 06:51:36 -0000 @@ -494,8 +494,6 @@ an_txeof(struct an_softc *sc, u_int16_t if (status & AN_EV_TX_EXC) ifp->if_oerrors++; - else - ifp->if_opackets++; cur = sc->sc_txcur; if (sc->sc_txd[cur].d_fid == id) { @@ -1107,7 +1105,6 @@ an_start(struct ifnet *ifp) break; } ifq_deq_commit(&ifp->if_snd, m); - ifp->if_opackets++; #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT); Index: dev/ic/ar5008.c =================================================================== RCS file: /cvs/src/sys/dev/ic/ar5008.c,v retrieving revision 1.38 diff -u -p -r1.38 ar5008.c --- dev/ic/ar5008.c 12 Jan 2017 16:32:28 -0000 1.38 +++ dev/ic/ar5008.c 22 Jan 2017 06:51:36 -0000 @@ -981,7 +981,6 @@ ar5008_tx_process(struct athn_softc *sc, return (EBUSY); SIMPLEQ_REMOVE_HEAD(&txq->head, bf_list); - ifp->if_opackets++; sc->sc_tx_timer = 0; Index: dev/ic/ar9003.c =================================================================== RCS file: /cvs/src/sys/dev/ic/ar9003.c,v retrieving revision 1.42 diff -u -p -r1.42 ar9003.c --- dev/ic/ar9003.c 12 Jan 2017 16:32:28 -0000 1.42 +++ dev/ic/ar9003.c 22 Jan 2017 06:51:36 -0000 @@ -1098,7 +1098,6 @@ ar9003_tx_process(struct athn_softc *sc) return (0); } SIMPLEQ_REMOVE_HEAD(&txq->head, bf_list); - ifp->if_opackets++; sc->sc_tx_timer = 0; Index: dev/ic/ath.c =================================================================== RCS file: /cvs/src/sys/dev/ic/ath.c,v retrieving revision 1.111 diff -u -p -r1.111 ath.c --- dev/ic/ath.c 13 Apr 2016 10:49:26 -0000 1.111 +++ dev/ic/ath.c 22 Jan 2017 06:51:36 -0000 @@ -874,7 +874,6 @@ ath_start(struct ifnet *ifp) splx(s); break; } - ifp->if_opackets++; #if NBPFILTER > 0 if (ifp->if_bpf) Index: dev/ic/atw.c =================================================================== RCS file: /cvs/src/sys/dev/ic/atw.c,v retrieving revision 1.94 diff -u -p -r1.94 atw.c --- dev/ic/atw.c 13 Apr 2016 10:49:26 -0000 1.94 +++ dev/ic/atw.c 22 Jan 2017 06:51:36 -0000 @@ -3292,8 +3292,6 @@ atw_txintr(struct atw_softc *sc) MASK_AND_RSHIFT(txstat, ATW_TXSTAT_ARC_MASK); else ifp->if_oerrors++; - - ifp->if_opackets++; } /* Index: dev/ic/bwi.c =================================================================== RCS file: /cvs/src/sys/dev/ic/bwi.c,v retrieving revision 1.123 diff -u -p -r1.123 bwi.c --- dev/ic/bwi.c 13 Apr 2016 10:49:26 -0000 1.123 +++ dev/ic/bwi.c 22 Jan 2017 06:51:36 -0000 @@ -9152,8 +9152,6 @@ bwi_txeof(struct bwi_softc *sc) continue; _bwi_txeof(sc, letoh16(tx_id)); - - ifp->if_opackets++; } if (ifq_is_oactive(&ifp->if_snd) == 0) Index: dev/ic/dc.c =================================================================== RCS file: /cvs/src/sys/dev/ic/dc.c,v retrieving revision 1.151 diff -u -p -r1.151 dc.c --- dev/ic/dc.c 4 May 2016 18:38:57 -0000 1.151 +++ dev/ic/dc.c 22 Jan 2017 06:51:36 -0000 @@ -2264,7 +2264,6 @@ dc_txeof(struct dc_softc *sc) ifp->if_collisions += (txstat & DC_TXSTAT_COLLCNT) >> 3; - ifp->if_opackets++; if (sc->dc_cdata.dc_tx_chain[idx].sd_map->dm_nsegs != 0) { bus_dmamap_t map = sc->dc_cdata.dc_tx_chain[idx].sd_map; Index: dev/ic/dp8390.c =================================================================== RCS file: /cvs/src/sys/dev/ic/dp8390.c,v retrieving revision 1.60 diff -u -p -r1.60 dp8390.c --- dev/ic/dp8390.c 13 Apr 2016 10:49:26 -0000 1.60 +++ dev/ic/dp8390.c 22 Jan 2017 06:51:36 -0000 @@ -692,12 +692,6 @@ dp8390_intr(void *arg) * and late collisions here. */ (void)NIC_GET(regt, regh, ED_P0_TSR); - - /* - * Update total number of successfully - * transmitted packets. - */ - ++ifp->if_opackets; } /* Clear watchdog timer. */ Index: dev/ic/dwc_gmac.c =================================================================== RCS file: /cvs/src/sys/dev/ic/dwc_gmac.c,v retrieving revision 1.4 diff -u -p -r1.4 dwc_gmac.c --- dev/ic/dwc_gmac.c 29 Nov 2016 10:22:30 -0000 1.4 +++ dev/ic/dwc_gmac.c 22 Jan 2017 06:51:36 -0000 @@ -808,8 +808,6 @@ dwc_gmac_start(struct ifnet *ifp) ifq_deq_commit(&ifp->if_snd, m_head); - ifp->if_opackets++; - #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m_head, BPF_DIRECTION_OUT); @@ -1082,7 +1080,6 @@ dwc_gmac_tx_intr(struct dwc_gmac_softc * if (data->td_m == NULL) continue; - ifp->if_opackets++; nsegs = data->td_active->dm_nsegs; bus_dmamap_sync(sc->sc_dmat, data->td_active, 0, data->td_active->dm_mapsize, BUS_DMASYNC_POSTWRITE); Index: dev/ic/elink3.c =================================================================== RCS file: /cvs/src/sys/dev/ic/elink3.c,v retrieving revision 1.94 diff -u -p -r1.94 elink3.c --- dev/ic/elink3.c 13 Apr 2016 10:49:26 -0000 1.94 +++ dev/ic/elink3.c 22 Jan 2017 06:51:36 -0000 @@ -1047,8 +1047,6 @@ startagain: splx(sh); - ++ifp->if_opackets; - readcheck: if ((bus_space_read_2(iot, ioh, ep_w1_reg(sc, EP_W1_RX_STATUS)) & ERR_INCOMPLETE) == 0) { Index: dev/ic/fxp.c =================================================================== RCS file: /cvs/src/sys/dev/ic/fxp.c,v retrieving revision 1.130 diff -u -p -r1.130 fxp.c --- dev/ic/fxp.c 13 Apr 2016 10:49:26 -0000 1.130 +++ dev/ic/fxp.c 22 Jan 2017 06:51:36 -0000 @@ -941,7 +941,6 @@ fxp_stats_update(void *arg) int s; FXP_STATS_SYNC(sc, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); - ifp->if_opackets += letoh32(sp->tx_good); ifp->if_collisions += letoh32(sp->tx_total_collisions); if (sp->rx_good) { sc->rx_idle_secs = 0; Index: dev/ic/gem.c =================================================================== RCS file: /cvs/src/sys/dev/ic/gem.c,v retrieving revision 1.120 diff -u -p -r1.120 gem.c --- dev/ic/gem.c 13 Apr 2016 10:49:26 -0000 1.120 +++ dev/ic/gem.c 22 Jan 2017 06:51:36 -0000 @@ -1638,7 +1638,6 @@ gem_tint(struct gem_softc *sc, u_int32_t bus_dmamap_unload(sc->sc_dmatag, sd->sd_map); m_freem(sd->sd_mbuf); sd->sd_mbuf = NULL; - ifp->if_opackets++; } free++; if (++cons == GEM_NTXDESC) Index: dev/ic/hme.c =================================================================== RCS file: /cvs/src/sys/dev/ic/hme.c,v retrieving revision 1.80 diff -u -p -r1.80 hme.c --- dev/ic/hme.c 13 Apr 2016 10:49:26 -0000 1.80 +++ dev/ic/hme.c 22 Jan 2017 06:51:36 -0000 @@ -762,8 +762,6 @@ hme_tint(struct hme_softc *sc) break; ifq_clr_oactive(&ifp->if_snd); - if (txflags & HME_XD_EOP) - ifp->if_opackets++; if (sd->sd_mbuf != NULL) { bus_dmamap_sync(sc->sc_dmatag, sd->sd_map, Index: dev/ic/i82596.c =================================================================== RCS file: /cvs/src/sys/dev/ic/i82596.c,v retrieving revision 1.52 diff -u -p -r1.52 i82596.c --- dev/ic/i82596.c 13 Apr 2016 10:49:26 -0000 1.52 +++ dev/ic/i82596.c 22 Jan 2017 06:51:36 -0000 @@ -753,7 +753,6 @@ i82596_tint(sc, scbstatus) } if (status & IE_STAT_OK) { - ifp->if_opackets++; ifp->if_collisions += (status & IE_XS_MAXCOLL); } else { ifp->if_oerrors++; Index: dev/ic/if_wi.c =================================================================== RCS file: /cvs/src/sys/dev/ic/if_wi.c,v retrieving revision 1.166 diff -u -p -r1.166 if_wi.c --- dev/ic/if_wi.c 13 Apr 2016 10:49:26 -0000 1.166 +++ dev/ic/if_wi.c 22 Jan 2017 06:51:36 -0000 @@ -836,8 +836,6 @@ wi_txeof(struct wi_softc *sc, int status if (status & WI_EV_TX_EXC) ifp->if_oerrors++; - else - ifp->if_opackets++; return; } Index: dev/ic/lemac.c =================================================================== RCS file: /cvs/src/sys/dev/ic/lemac.c,v retrieving revision 1.29 diff -u -p -r1.29 lemac.c --- dev/ic/lemac.c 13 Apr 2016 10:49:26 -0000 1.29 +++ dev/ic/lemac.c 22 Jan 2017 06:51:36 -0000 @@ -153,7 +153,6 @@ lemac_tne_intr(struct lemac_softc *sc) sc->sc_cntrs.cntr_tne_intrs++; while (txcount-- > 0) { unsigned txsts = LEMAC_INB(sc, LEMAC_REG_TDQ); - sc->sc_if.if_opackets++; /* another one done */ if ((txsts & (LEMAC_TDQ_LCL|LEMAC_TDQ_NCL)) || (txsts & LEMAC_TDQ_COL) == LEMAC_TDQ_EXCCOL) { if (txsts & LEMAC_TDQ_NCL) Index: dev/ic/malo.c =================================================================== RCS file: /cvs/src/sys/dev/ic/malo.c,v retrieving revision 1.112 diff -u -p -r1.112 malo.c --- dev/ic/malo.c 13 Apr 2016 10:49:26 -0000 1.112 +++ dev/ic/malo.c 22 Jan 2017 06:51:36 -0000 @@ -1333,7 +1333,6 @@ malo_tx_intr(struct malo_softc *sc) case 0x1: DPRINTF(2, "%s: data frame was sent successfully\n", sc->sc_dev.dv_xname); - ifp->if_opackets++; break; default: DPRINTF(1, "%s: data frame sending error\n", Index: dev/ic/mtd8xx.c =================================================================== RCS file: /cvs/src/sys/dev/ic/mtd8xx.c,v retrieving revision 1.30 diff -u -p -r1.30 mtd8xx.c --- dev/ic/mtd8xx.c 13 Apr 2016 10:49:26 -0000 1.30 +++ dev/ic/mtd8xx.c 22 Jan 2017 06:51:36 -0000 @@ -1031,7 +1031,6 @@ mtd_txeof(struct mtd_softc *sc) ifp->if_collisions += TSW_NCR_GET(txstat); } - ifp->if_opackets++; if (sc->mtd_cdata.mtd_tx_chain[idx].sd_map->dm_nsegs != 0) { bus_dmamap_t map = sc->mtd_cdata.mtd_tx_chain[idx].sd_map; Index: dev/ic/pgt.c =================================================================== RCS file: /cvs/src/sys/dev/ic/pgt.c,v retrieving revision 1.88 diff -u -p -r1.88 pgt.c --- dev/ic/pgt.c 29 Nov 2016 10:22:30 -0000 1.88 +++ dev/ic/pgt.c 22 Jan 2017 06:51:36 -0000 @@ -2181,7 +2181,6 @@ pgt_start(struct ifnet *ifp) if (ifp->if_bpf != NULL) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT); #endif - ifp->if_opackets++; ifp->if_timer = 1; sc->sc_txtimer = 5; ni = ieee80211_find_txnode(&sc->sc_ic, Index: dev/ic/re.c =================================================================== RCS file: /cvs/src/sys/dev/ic/re.c,v retrieving revision 1.199 diff -u -p -r1.199 re.c --- dev/ic/re.c 4 Jan 2017 01:47:32 -0000 1.199 +++ dev/ic/re.c 22 Jan 2017 06:51:36 -0000 @@ -1443,8 +1443,6 @@ re_txeof(struct rl_softc *sc) ifp->if_collisions++; if (txstat & RL_TDESC_STAT_TXERRSUM) ifp->if_oerrors++; - else - ifp->if_opackets++; cons = RL_NEXT_TX_DESC(sc, idx); free = 1; Index: dev/ic/rt2560.c =================================================================== RCS file: /cvs/src/sys/dev/ic/rt2560.c,v retrieving revision 1.81 diff -u -p -r1.81 rt2560.c --- dev/ic/rt2560.c 6 Oct 2016 15:18:48 -0000 1.81 +++ dev/ic/rt2560.c 22 Jan 2017 06:51:36 -0000 @@ -940,7 +940,6 @@ rt2560_tx_intr(struct rt2560_softc *sc) case RT2560_TX_SUCCESS: DPRINTFN(10, ("data frame sent successfully\n")); rn->amn.amn_txcnt++; - ifp->if_opackets++; break; case RT2560_TX_SUCCESS_RETRY: @@ -948,7 +947,6 @@ rt2560_tx_intr(struct rt2560_softc *sc) (letoh32(desc->flags) >> 5) & 0x7)); rn->amn.amn_txcnt++; rn->amn.amn_retrycnt++; - ifp->if_opackets++; break; case RT2560_TX_FAIL_RETRY: Index: dev/ic/rt2661.c =================================================================== RCS file: /cvs/src/sys/dev/ic/rt2661.c,v retrieving revision 1.90 diff -u -p -r1.90 rt2661.c --- dev/ic/rt2661.c 13 Apr 2016 10:49:26 -0000 1.90 +++ dev/ic/rt2661.c 22 Jan 2017 06:51:36 -0000 @@ -1070,7 +1070,6 @@ rt2661_tx_intr(struct rt2661_softc *sc) if (retrycnt > 0) amn->amn.amn_retrycnt++; } - ifp->if_opackets++; break; case RT2661_TX_RETRY_FAIL: Index: dev/ic/rt2860.c =================================================================== RCS file: /cvs/src/sys/dev/ic/rt2860.c,v retrieving revision 1.91 diff -u -p -r1.91 rt2860.c --- dev/ic/rt2860.c 17 Aug 2016 11:50:52 -0000 1.91 +++ dev/ic/rt2860.c 22 Jan 2017 06:51:36 -0000 @@ -1172,8 +1172,6 @@ rt2860_tx_intr(struct rt2860_softc *sc, SLIST_INSERT_HEAD(&sc->data_pool, data, next); ring->data[ring->next] = NULL; - - ifp->if_opackets++; } ring->queued--; ring->next = (ring->next + 1) % RT2860_TX_RING_COUNT; Index: dev/ic/rtl81x9.c =================================================================== RCS file: /cvs/src/sys/dev/ic/rtl81x9.c,v retrieving revision 1.95 diff -u -p -r1.95 rtl81x9.c --- dev/ic/rtl81x9.c 13 Apr 2016 10:49:26 -0000 1.95 +++ dev/ic/rtl81x9.c 22 Jan 2017 06:51:36 -0000 @@ -718,9 +718,7 @@ rl_txeof(struct rl_softc *sc) if ((txstat & RL_TXSTAT_TX_UNDERRUN) && (sc->rl_txthresh < 2016)) sc->rl_txthresh += 32; - if (txstat & RL_TXSTAT_TX_OK) - ifp->if_opackets++; - else { + if (!ISSET(txstat, RL_TXSTAT_TX_OK)) { int oldthresh; ifp->if_oerrors++; Index: dev/ic/rtw.c =================================================================== RCS file: /cvs/src/sys/dev/ic/rtw.c,v retrieving revision 1.96 diff -u -p -r1.96 rtw.c --- dev/ic/rtw.c 13 Apr 2016 10:49:26 -0000 1.96 +++ dev/ic/rtw.c 22 Jan 2017 06:51:36 -0000 @@ -2775,7 +2775,6 @@ rtw_dequeue(struct ifnet *ifp, struct rt return 0; } DPRINTF(sc, RTW_DEBUG_XMIT, ("%s: dequeue data frame\n", __func__)); - ifp->if_opackets++; #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m0, BPF_DIRECTION_OUT); Index: dev/ic/smc83c170.c =================================================================== RCS file: /cvs/src/sys/dev/ic/smc83c170.c,v retrieving revision 1.26 diff -u -p -r1.26 smc83c170.c --- dev/ic/smc83c170.c 13 Apr 2016 10:49:26 -0000 1.26 +++ dev/ic/smc83c170.c 22 Jan 2017 06:51:36 -0000 @@ -755,8 +755,6 @@ epic_intr(void *arg) */ if ((txstatus & ET_TXSTAT_PACKETTX) == 0) ifp->if_oerrors++; - else - ifp->if_opackets++; ifp->if_collisions += TXSTAT_COLLISIONS(txstatus); if (txstatus & ET_TXSTAT_CARSENSELOST) Index: dev/ic/smc91cxx.c =================================================================== RCS file: /cvs/src/sys/dev/ic/smc91cxx.c,v retrieving revision 1.48 diff -u -p -r1.48 smc91cxx.c --- dev/ic/smc91cxx.c 13 Jul 2016 15:40:26 -0000 1.48 +++ dev/ic/smc91cxx.c 22 Jan 2017 06:51:36 -0000 @@ -685,7 +685,6 @@ smc91cxx_start(ifp) bpf_mtap(ifp->if_bpf, top, BPF_DIRECTION_OUT); #endif - ifp->if_opackets++; m_freem(top); readcheck: Index: dev/ic/ti.c =================================================================== RCS file: /cvs/src/sys/dev/ic/ti.c,v retrieving revision 1.24 diff -u -p -r1.24 ti.c --- dev/ic/ti.c 13 Apr 2016 10:49:26 -0000 1.24 +++ dev/ic/ti.c 22 Jan 2017 06:51:36 -0000 @@ -1637,9 +1637,6 @@ ti_txeof_tigon1(struct ti_softc *sc) ti_mem_read(sc, TI_TX_RING_BASE + idx * sizeof(txdesc), sizeof(txdesc), (caddr_t)&txdesc); - if (txdesc.ti_flags & TI_BDFLAG_END) - ifp->if_opackets++; - if (sc->ti_cdata.ti_tx_chain[idx] != NULL) { m_freem(sc->ti_cdata.ti_tx_chain[idx]); sc->ti_cdata.ti_tx_chain[idx] = NULL; @@ -1684,8 +1681,6 @@ ti_txeof_tigon2(struct ti_softc *sc) idx = sc->ti_tx_saved_considx; cur_tx = &sc->ti_rdata->ti_tx_ring[idx]; - if (cur_tx->ti_flags & TI_BDFLAG_END) - ifp->if_opackets++; if (sc->ti_cdata.ti_tx_chain[idx] != NULL) { m_freem(sc->ti_cdata.ti_tx_chain[idx]); sc->ti_cdata.ti_tx_chain[idx] = NULL; Index: dev/ic/xl.c =================================================================== RCS file: /cvs/src/sys/dev/ic/xl.c,v retrieving revision 1.131 diff -u -p -r1.131 xl.c --- dev/ic/xl.c 13 Apr 2016 10:49:26 -0000 1.131 +++ dev/ic/xl.c 22 Jan 2017 06:51:36 -0000 @@ -1272,7 +1272,6 @@ xl_txeof(struct xl_softc *sc) break; sc->xl_cdata.xl_tx_head = cur_tx->xl_next; - ifp->if_opackets++; if (cur_tx->map->dm_nsegs != 0) { bus_dmamap_t map = cur_tx->map; @@ -1333,8 +1332,6 @@ xl_txeof_90xB(struct xl_softc *sc) 0, cur_tx->map->dm_mapsize, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->sc_dmat, cur_tx->map); } - - ifp->if_opackets++; sc->xl_cdata.xl_tx_cnt--; XL_INC(idx, XL_TX_LIST_CNT); Index: dev/isa/if_ef_isapnp.c =================================================================== RCS file: /cvs/src/sys/dev/isa/if_ef_isapnp.c,v retrieving revision 1.38 diff -u -p -r1.38 if_ef_isapnp.c --- dev/isa/if_ef_isapnp.c 13 Apr 2016 10:49:26 -0000 1.38 +++ dev/isa/if_ef_isapnp.c 22 Jan 2017 06:51:36 -0000 @@ -320,8 +320,6 @@ startagain: splx(s); - ifp->if_opackets++; - goto startagain; } Index: dev/isa/if_eg.c =================================================================== RCS file: /cvs/src/sys/dev/isa/if_eg.c,v retrieving revision 1.46 diff -u -p -r1.46 if_eg.c --- dev/isa/if_eg.c 13 Apr 2016 10:49:26 -0000 1.46 +++ dev/isa/if_eg.c 22 Jan 2017 06:51:36 -0000 @@ -625,8 +625,7 @@ egintr(void *arg) if (sc->eg_pcb[6] || sc->eg_pcb[7]) { DPRINTF(("packet dropped\n")); sc->sc_arpcom.ac_if.if_oerrors++; - } else - sc->sc_arpcom.ac_if.if_opackets++; + } sc->sc_arpcom.ac_if.if_collisions += sc->eg_pcb[8] & 0xf; ifq_clr_oactive(&sc->sc_arpcom.ac_if.if_snd); Index: dev/isa/if_el.c =================================================================== RCS file: /cvs/src/sys/dev/isa/if_el.c,v retrieving revision 1.33 diff -u -p -r1.33 if_el.c --- dev/isa/if_el.c 13 Apr 2016 10:49:26 -0000 1.33 +++ dev/isa/if_el.c 22 Jan 2017 06:51:36 -0000 @@ -365,7 +365,6 @@ elstart(ifp) break; } } else { - ifp->if_opackets++; break; } } Index: dev/isa/if_ex.c =================================================================== RCS file: /cvs/src/sys/dev/isa/if_ex.c,v retrieving revision 1.44 diff -u -p -r1.44 if_ex.c --- dev/isa/if_ex.c 13 Apr 2016 10:49:26 -0000 1.44 +++ dev/isa/if_ex.c 22 Jan 2017 06:51:36 -0000 @@ -515,7 +515,6 @@ ex_start(struct ifnet *ifp) BPF_DIRECTION_OUT); #endif ifp->if_timer = 2; - ifp->if_opackets++; m_freem(opkt); } else { ifq_deq_rollback(&ifp->if_snd, opkt); @@ -621,9 +620,7 @@ ex_tx_intr(struct ex_softc *sc) break; tx_status = CSR_READ_2(sc, IO_PORT_REG); sc->tx_head = CSR_READ_2(sc, IO_PORT_REG); - if (tx_status & TX_OK_bit) - ifp->if_opackets++; - else + if (!ISSET(tx_status, TX_OK_bit)) ifp->if_oerrors++; ifp->if_collisions += tx_status & No_Collisions_bits; } Index: dev/isa/if_ie.c =================================================================== RCS file: /cvs/src/sys/dev/isa/if_ie.c,v retrieving revision 1.52 diff -u -p -r1.52 if_ie.c --- dev/isa/if_ie.c 13 Apr 2016 10:49:26 -0000 1.52 +++ dev/isa/if_ie.c 22 Jan 2017 06:51:36 -0000 @@ -940,7 +940,6 @@ ietint(sc) printf("ietint: command still busy!\n"); if (status & IE_STAT_OK) { - ifp->if_opackets++; ifp->if_collisions += status & IE_XS_MAXCOLL; } else { ifp->if_oerrors++; Index: dev/pci/if_age.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_age.c,v retrieving revision 1.33 diff -u -p -r1.33 if_age.c --- dev/pci/if_age.c 13 Apr 2016 10:34:32 -0000 1.33 +++ dev/pci/if_age.c 22 Jan 2017 06:51:36 -0000 @@ -1933,9 +1933,6 @@ age_stats_update(struct age_softc *sc) stat->tx_bcast_bytes += smb->tx_bcast_bytes; stat->tx_mcast_bytes += smb->tx_mcast_bytes; - /* Update counters in ifnet. */ - ifp->if_opackets += smb->tx_frames; - ifp->if_collisions += smb->tx_single_colls + smb->tx_multi_colls + smb->tx_late_colls + smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT; Index: dev/pci/if_alc.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_alc.c,v retrieving revision 1.40 diff -u -p -r1.40 if_alc.c --- dev/pci/if_alc.c 29 Nov 2016 10:22:30 -0000 1.40 +++ dev/pci/if_alc.c 22 Jan 2017 06:51:36 -0000 @@ -1625,9 +1625,6 @@ alc_stats_update(struct alc_softc *sc) stat->tx_bcast_bytes += smb->tx_bcast_bytes; stat->tx_mcast_bytes += smb->tx_mcast_bytes; - /* Update counters in ifnet. */ - ifp->if_opackets += smb->tx_frames; - ifp->if_collisions += smb->tx_single_colls + smb->tx_multi_colls * 2 + smb->tx_late_colls + smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT; Index: dev/pci/if_ale.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_ale.c,v retrieving revision 1.44 diff -u -p -r1.44 if_ale.c --- dev/pci/if_ale.c 13 Apr 2016 10:34:32 -0000 1.44 +++ dev/pci/if_ale.c 22 Jan 2017 06:51:36 -0000 @@ -1227,9 +1227,6 @@ ale_stats_update(struct ale_softc *sc) stat->tx_bcast_bytes += smb->tx_bcast_bytes; stat->tx_mcast_bytes += smb->tx_mcast_bytes; - /* Update counters in ifnet. */ - ifp->if_opackets += smb->tx_frames; - ifp->if_collisions += smb->tx_single_colls + smb->tx_multi_colls * 2 + smb->tx_late_colls + smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT; Index: dev/pci/if_bce.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_bce.c,v retrieving revision 1.51 diff -u -p -r1.51 if_bce.c --- dev/pci/if_bce.c 13 Apr 2016 10:34:32 -0000 1.51 +++ dev/pci/if_bce.c 22 Jan 2017 06:51:36 -0000 @@ -771,7 +771,6 @@ bce_txintr(struct bce_softc *sc) /* do any post dma memory ops on transmit data */ bus_dmamap_sync(sc->bce_dmatag, sc->bce_txdata_map, i * MCLBYTES, MCLBYTES, BUS_DMASYNC_POSTWRITE); - ifp->if_opackets++; } sc->bce_txin = curr; Index: dev/pci/if_bge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_bge.c,v retrieving revision 1.382 diff -u -p -r1.382 if_bge.c --- dev/pci/if_bge.c 13 Apr 2016 10:34:32 -0000 1.382 +++ dev/pci/if_bge.c 22 Jan 2017 06:51:36 -0000 @@ -3645,8 +3645,6 @@ bge_txeof(struct bge_softc *sc) freed = 0; while (cons != newcons) { cur_tx = &sc->bge_rdata->bge_tx_ring[cons]; - if (cur_tx->bge_flags & BGE_TXBDFLAG_END) - ifp->if_opackets++; m = sc->bge_cdata.bge_tx_chain[cons]; if (m != NULL) { dmamap = sc->bge_cdata.bge_tx_map[cons]; Index: dev/pci/if_bnx.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_bnx.c,v retrieving revision 1.122 diff -u -p -r1.122 if_bnx.c --- dev/pci/if_bnx.c 5 May 2016 23:01:28 -0000 1.122 +++ dev/pci/if_bnx.c 22 Jan 2017 06:51:36 -0000 @@ -4563,8 +4563,6 @@ bnx_tx_intr(struct bnx_softc *sc) /* Free the mbuf. */ m_freem(sc->tx_mbuf_ptr[sw_tx_chain_cons]); sc->tx_mbuf_ptr[sw_tx_chain_cons] = NULL; - - ifp->if_opackets++; } freed++; Index: dev/pci/if_cas.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_cas.c,v retrieving revision 1.50 diff -u -p -r1.50 if_cas.c --- dev/pci/if_cas.c 13 Apr 2016 10:34:32 -0000 1.50 +++ dev/pci/if_cas.c 22 Jan 2017 06:51:36 -0000 @@ -1846,7 +1846,6 @@ cas_tint(struct cas_softc *sc, u_int32_t bus_dmamap_unload(sc->sc_dmatag, sd->sd_map); m_freem(sd->sd_mbuf); sd->sd_mbuf = NULL; - ifp->if_opackets++; } freed++; if (++cons == CAS_NTXDESC) Index: dev/pci/if_de.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_de.c,v retrieving revision 1.135 diff -u -p -r1.135 if_de.c --- dev/pci/if_de.c 13 Apr 2016 10:34:32 -0000 1.135 +++ dev/pci/if_de.c 22 Jan 2017 06:51:36 -0000 @@ -3557,7 +3557,6 @@ tulip_tx_intr(tulip_softc_t * const sc) sc->tulip_txtimer = 0; else if (xmits > 0) sc->tulip_txtimer = TULIP_TXTIMER; - sc->tulip_if.if_opackets += xmits; TULIP_PERFEND(txintr); return (descs); } Index: dev/pci/if_em.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_em.c,v retrieving revision 1.332 diff -u -p -r1.332 if_em.c --- dev/pci/if_em.c 27 Oct 2016 03:06:53 -0000 1.332 +++ dev/pci/if_em.c 22 Jan 2017 06:51:36 -0000 @@ -2416,8 +2416,6 @@ em_txeof(struct em_softc *sc) if (free == 0) return; - ifp->if_opackets += free; - sc->sc_tx_desc_tail = tail; if (ifq_is_oactive(&ifp->if_snd)) Index: dev/pci/if_et.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_et.c,v retrieving revision 1.34 diff -u -p -r1.34 if_et.c --- dev/pci/if_et.c 13 Apr 2016 10:34:32 -0000 1.34 +++ dev/pci/if_et.c 22 Jan 2017 06:51:36 -0000 @@ -1912,7 +1912,6 @@ et_txeof(struct et_softc *sc) bus_dmamap_unload(sc->sc_dmat, tb->tb_dmap); m_freem(tb->tb_mbuf); tb->tb_mbuf = NULL; - ifp->if_opackets++; } if (++tbd->tbd_start_index == ET_TX_NDESC) { Index: dev/pci/if_ipw.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_ipw.c,v retrieving revision 1.118 diff -u -p -r1.118 if_ipw.c --- dev/pci/if_ipw.c 5 Sep 2016 10:17:30 -0000 1.118 +++ dev/pci/if_ipw.c 22 Jan 2017 06:51:36 -0000 @@ -1020,9 +1020,6 @@ ipw_tx_intr(struct ipw_softc *sc) for (i = (sc->txold + 1) % IPW_NTBD; i != r; i = (i + 1) % IPW_NTBD) { sbd = &sc->stbd_list[i]; - if (sbd->type == IPW_SBD_TYPE_DATA) - ifp->if_opackets++; - ipw_release_sbd(sc, sbd); sc->txfree++; } Index: dev/pci/if_iwi.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_iwi.c,v retrieving revision 1.133 diff -u -p -r1.133 if_iwi.c --- dev/pci/if_iwi.c 5 Sep 2016 08:17:48 -0000 1.133 +++ dev/pci/if_iwi.c 22 Jan 2017 06:51:36 -0000 @@ -1127,8 +1127,6 @@ iwi_tx_intr(struct iwi_softc *sc, struct ieee80211_release_node(ic, data->ni); data->ni = NULL; - ifp->if_opackets++; - txq->queued--; txq->next = (txq->next + 1) % IWI_TX_RING_COUNT; } Index: dev/pci/if_iwm.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_iwm.c,v retrieving revision 1.157 diff -u -p -r1.157 if_iwm.c --- dev/pci/if_iwm.c 21 Jan 2017 11:21:41 -0000 1.157 +++ dev/pci/if_iwm.c 22 Jan 2017 06:51:36 -0000 @@ -3437,8 +3437,6 @@ iwm_rx_tx_cmd_single(struct iwm_softc *s if (txfail) ifp->if_oerrors++; - else - ifp->if_opackets++; } void Index: dev/pci/if_iwn.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_iwn.c,v retrieving revision 1.181 diff -u -p -r1.181 if_iwn.c --- dev/pci/if_iwn.c 12 Jan 2017 18:06:57 -0000 1.181 +++ dev/pci/if_iwn.c 22 Jan 2017 06:51:36 -0000 @@ -2399,8 +2399,7 @@ iwn_tx_done(struct iwn_softc *sc, struct if (txfail) { DPRINTF(("%s: status=0x%x\n", __func__, status)); ifp->if_oerrors++; - } else - ifp->if_opackets++; + } /* Unmap and free mbuf. */ bus_dmamap_sync(sc->sc_dmat, data->map, 0, data->map->dm_mapsize, Index: dev/pci/if_ix.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_ix.c,v retrieving revision 1.148 diff -u -p -r1.148 if_ix.c --- dev/pci/if_ix.c 9 Dec 2016 17:41:39 -0000 1.148 +++ dev/pci/if_ix.c 22 Jan 2017 06:51:36 -0000 @@ -2386,7 +2386,6 @@ ixgbe_txeof(struct tx_ring *txr) &txr->tx_base[first]; } ++txr->packets; - ++ifp->if_opackets; /* See if there is more work now */ last = tx_buffer->eop_index; if (last != -1) { Index: dev/pci/if_ixgb.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_ixgb.c,v retrieving revision 1.70 diff -u -p -r1.70 if_ixgb.c --- dev/pci/if_ixgb.c 29 Nov 2016 10:22:30 -0000 1.70 +++ dev/pci/if_ixgb.c 22 Jan 2017 06:51:36 -0000 @@ -1383,8 +1383,6 @@ ixgb_txeof(struct ixgb_softc *sc) num_avail++; if (tx_buffer->m_head != NULL) { - ifp->if_opackets++; - if (tx_buffer->map->dm_nsegs > 0) { bus_dmamap_sync(sc->txtag, tx_buffer->map, 0, tx_buffer->map->dm_mapsize, Index: dev/pci/if_jme.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_jme.c,v retrieving revision 1.48 diff -u -p -r1.48 if_jme.c --- dev/pci/if_jme.c 29 Nov 2016 10:22:30 -0000 1.48 +++ dev/pci/if_jme.c 22 Jan 2017 06:51:36 -0000 @@ -1525,7 +1525,6 @@ jme_txeof(struct jme_softc *sc) if (status & (JME_TD_TMOUT | JME_TD_RETRY_EXP)) { ifp->if_oerrors++; } else { - ifp->if_opackets++; if (status & JME_TD_COLLISION) { ifp->if_collisions += letoh32(txd->tx_desc->buflen) & Index: dev/pci/if_lge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_lge.c,v retrieving revision 1.72 diff -u -p -r1.72 if_lge.c --- dev/pci/if_lge.c 13 Apr 2016 10:34:32 -0000 1.72 +++ dev/pci/if_lge.c 22 Jan 2017 06:51:36 -0000 @@ -777,7 +777,6 @@ lge_txeof(struct lge_softc *sc) while (idx != sc->lge_cdata.lge_tx_prod && txdone) { cur_tx = &sc->lge_ldata->lge_tx_list[idx]; - ifp->if_opackets++; if (cur_tx->lge_mbuf != NULL) { m_freem(cur_tx->lge_mbuf); cur_tx->lge_mbuf = NULL; Index: dev/pci/if_lii.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_lii.c,v retrieving revision 1.43 diff -u -p -r1.43 if_lii.c --- dev/pci/if_lii.c 13 Apr 2016 10:34:32 -0000 1.43 +++ dev/pci/if_lii.c 22 Jan 2017 06:51:36 -0000 @@ -976,9 +976,7 @@ lii_txintr(struct lii_softc *sc) sc->sc_txd_ack = (sc->sc_txd_ack + txph->txph_size + 7 ) & ~3; sc->sc_txd_ack %= AT_TXD_BUFFER_SIZE; - if (txs->txps_flags & LII_TXF_SUCCESS) - ++ifp->if_opackets; - else + if (!ISSET(txs->txps_flags, LII_TXF_SUCCESS)) ++ifp->if_oerrors; ifq_clr_oactive(&ifp->if_snd); } Index: dev/pci/if_msk.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_msk.c,v retrieving revision 1.124 diff -u -p -r1.124 if_msk.c --- dev/pci/if_msk.c 8 Jan 2017 18:08:14 -0000 1.124 +++ dev/pci/if_msk.c 22 Jan 2017 06:51:36 -0000 @@ -1697,8 +1697,6 @@ msk_txeof(struct sk_if_softc *sc_if) if (mskdebug >= 2) msk_dump_txdesc(cur_tx, idx); #endif - if (sk_ctl & SK_Y2_TXCTL_LASTFRAG) - ifp->if_opackets++; if (sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf != NULL) { entry = sc_if->sk_cdata.sk_tx_map[idx]; Index: dev/pci/if_myx.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_myx.c,v retrieving revision 1.99 diff -u -p -r1.99 if_myx.c --- dev/pci/if_myx.c 31 Oct 2016 01:38:57 -0000 1.99 +++ dev/pci/if_myx.c 22 Jan 2017 06:51:36 -0000 @@ -1686,8 +1686,6 @@ myx_txeof(struct myx_softc *sc, u_int32_ bus_dmamap_unload(sc->sc_dmat, map); m_freem(ms->ms_m); - ifp->if_opackets++; - if (++cons >= sc->sc_tx_ring_count) cons = 0; } while (++sc->sc_tx_count != done_count); Index: dev/pci/if_nep.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_nep.c,v retrieving revision 1.26 diff -u -p -r1.26 if_nep.c --- dev/pci/if_nep.c 15 Sep 2016 02:00:17 -0000 1.26 +++ dev/pci/if_nep.c 22 Jan 2017 06:51:36 -0000 @@ -1091,7 +1091,6 @@ nep_tx_proc(struct nep_softc *sc) m_freem(txb->nb_m); txb->nb_m = NULL; - ifp->if_opackets++; count--; } Index: dev/pci/if_nfe.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_nfe.c,v retrieving revision 1.118 diff -u -p -r1.118 if_nfe.c --- dev/pci/if_nfe.c 29 Nov 2016 10:22:30 -0000 1.118 +++ dev/pci/if_nfe.c 22 Jan 2017 06:51:36 -0000 @@ -817,8 +817,7 @@ nfe_txeof(struct nfe_softc *sc) printf("%s: tx v1 error %b\n", sc->sc_dev.dv_xname, flags, NFE_V1_TXERR); ifp->if_oerrors++; - } else - ifp->if_opackets++; + } } else { if (!(flags & NFE_TX_LASTFRAG_V2) && data->m == NULL) goto skip; @@ -827,8 +826,7 @@ nfe_txeof(struct nfe_softc *sc) printf("%s: tx v2 error %b\n", sc->sc_dev.dv_xname, flags, NFE_V2_TXERR); ifp->if_oerrors++; - } else - ifp->if_opackets++; + } } if (data->m == NULL) { /* should not get there */ Index: dev/pci/if_nge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_nge.c,v retrieving revision 1.91 diff -u -p -r1.91 if_nge.c --- dev/pci/if_nge.c 13 Apr 2016 10:34:32 -0000 1.91 +++ dev/pci/if_nge.c 22 Jan 2017 06:51:36 -0000 @@ -1143,7 +1143,6 @@ nge_txeof(struct nge_softc *sc) ifp->if_collisions += (cur_tx->nge_txstat & NGE_TXSTAT_COLLCNT) >> 16; - ifp->if_opackets++; if (cur_tx->nge_mbuf != NULL) { m_freem(cur_tx->nge_mbuf); cur_tx->nge_mbuf = NULL; Index: dev/pci/if_nxe.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_nxe.c,v retrieving revision 1.73 diff -u -p -r1.73 if_nxe.c --- dev/pci/if_nxe.c 13 Apr 2016 10:34:32 -0000 1.73 +++ dev/pci/if_nxe.c 22 Jan 2017 06:51:36 -0000 @@ -1389,7 +1389,6 @@ nxe_start(struct ifnet *ifp) bus_dmamap_sync(sc->sc_dmat, dmap, 0, dmap->dm_mapsize, BUS_DMASYNC_PREWRITE); - ifp->if_opackets++; } while (nr->nr_ready >= NXE_TXD_DESCS); nxe_ring_sync(sc, nr, BUS_DMASYNC_PREWRITE); Index: dev/pci/if_oce.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_oce.c,v retrieving revision 1.98 diff -u -p -r1.98 if_oce.c --- dev/pci/if_oce.c 15 Sep 2016 02:00:17 -0000 1.98 +++ dev/pci/if_oce.c 22 Jan 2017 06:51:36 -0000 @@ -1204,7 +1204,6 @@ oce_start(struct ifnet *ifp) int oce_encap(struct oce_softc *sc, struct mbuf **mpp, int wqidx) { - struct ifnet *ifp = &sc->sc_ac.ac_if; struct mbuf *m = *mpp; struct oce_wq *wq = sc->sc_wq[wqidx]; struct oce_pkt *pkt = NULL; @@ -1307,8 +1306,6 @@ oce_encap(struct oce_softc *sc, struct m } oce_pkt_put(&wq->pkt_list, pkt); - - ifp->if_opackets++; oce_dma_sync(&wq->ring->dma, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); Index: dev/pci/if_pcn.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_pcn.c,v retrieving revision 1.42 diff -u -p -r1.42 if_pcn.c --- dev/pci/if_pcn.c 29 Nov 2016 10:22:30 -0000 1.42 +++ dev/pci/if_pcn.c 22 Jan 2017 06:51:36 -0000 @@ -1268,7 +1268,6 @@ pcn_txintr(struct pcn_softc *sc) /* Real number is unknown. */ ifp->if_collisions += 2; } - ifp->if_opackets++; next_packet: sc->sc_txfree += txs->txs_dmamap->dm_nsegs; bus_dmamap_sync(sc->sc_dmat, txs->txs_dmamap, Index: dev/pci/if_rtwn.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_rtwn.c,v retrieving revision 1.24 diff -u -p -r1.24 if_rtwn.c --- dev/pci/if_rtwn.c 26 Jul 2016 13:00:28 -0000 1.24 +++ dev/pci/if_rtwn.c 22 Jan 2017 06:51:36 -0000 @@ -1126,7 +1126,6 @@ rtwn_tx_done(struct rtwn_pci_softc *sc, ieee80211_release_node(ic, tx_data->ni); tx_data->ni = NULL; - ifp->if_opackets++; sc->sc_sc.sc_tx_timer = 0; tx_ring->queued--; } Index: dev/pci/if_se.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_se.c,v retrieving revision 1.19 diff -u -p -r1.19 if_se.c --- dev/pci/if_se.c 13 Apr 2016 10:34:32 -0000 1.19 +++ dev/pci/if_se.c 22 Jan 2017 06:51:36 -0000 @@ -1002,8 +1002,7 @@ se_txeof(struct se_softc *sc) ifp->if_xname, txstat, TX_ERR_BITS); ifp->if_oerrors++; /* TODO: better error differentiation */ - } else - ifp->if_opackets++; + } if (cd->se_tx_mbuf[i] != NULL) { bus_dmamap_sync(sc->sc_dmat, cd->se_tx_map[i], 0, Index: dev/pci/if_sis.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_sis.c,v retrieving revision 1.134 diff -u -p -r1.134 if_sis.c --- dev/pci/if_sis.c 13 Apr 2016 10:34:32 -0000 1.134 +++ dev/pci/if_sis.c 22 Jan 2017 06:51:36 -0000 @@ -1498,7 +1498,6 @@ sis_txeof(struct sis_softc *sc) ifp->if_collisions += (txstat & SIS_TXSTAT_COLLCNT) >> 16; - ifp->if_opackets++; if (cur_tx->map->dm_nsegs != 0) { bus_dmamap_t map = cur_tx->map; Index: dev/pci/if_sk.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_sk.c,v retrieving revision 1.185 diff -u -p -r1.185 if_sk.c --- dev/pci/if_sk.c 8 Jan 2017 18:08:14 -0000 1.185 +++ dev/pci/if_sk.c 22 Jan 2017 06:51:36 -0000 @@ -1672,8 +1672,6 @@ sk_txeof(struct sk_if_softc *sc_if) SK_CDTXSYNC(sc_if, idx, 1, BUS_DMASYNC_PREREAD); break; } - if (sk_ctl & SK_TXCTL_LASTFRAG) - ifp->if_opackets++; if (sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf != NULL) { entry = sc_if->sk_cdata.sk_tx_map[idx]; Index: dev/pci/if_ste.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_ste.c,v retrieving revision 1.64 diff -u -p -r1.64 if_ste.c --- dev/pci/if_ste.c 13 Apr 2016 10:34:32 -0000 1.64 +++ dev/pci/if_ste.c 22 Jan 2017 06:51:36 -0000 @@ -749,7 +749,6 @@ ste_txeof(struct ste_softc *sc) m_freem(cur_tx->ste_mbuf); cur_tx->ste_mbuf = NULL; ifq_clr_oactive(&ifp->if_snd); - ifp->if_opackets++; STE_INC(idx, STE_TX_LIST_CNT); } Index: dev/pci/if_stge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_stge.c,v retrieving revision 1.68 diff -u -p -r1.68 if_stge.c --- dev/pci/if_stge.c 29 Nov 2016 10:22:30 -0000 1.68 +++ dev/pci/if_stge.c 22 Jan 2017 06:51:36 -0000 @@ -1031,9 +1031,6 @@ stge_stats_update(struct stge_softc *sc) (void) CSR_READ_4(sc, STGE_OctetXmtdOk); - ifp->if_opackets += - CSR_READ_4(sc, STGE_FramesXmtdOk); - ifp->if_collisions += CSR_READ_4(sc, STGE_LateCollisions) + CSR_READ_4(sc, STGE_MultiColFrames) + Index: dev/pci/if_tht.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_tht.c,v retrieving revision 1.139 diff -u -p -r1.139 if_tht.c --- dev/pci/if_tht.c 13 Apr 2016 10:34:32 -0000 1.139 +++ dev/pci/if_tht.c 22 Jan 2017 06:51:36 -0000 @@ -1153,8 +1153,6 @@ tht_start(struct ifnet *ifp) bus_dmamap_sync(sc->sc_thtc->sc_dmat, pkt->tp_dmap, 0, pkt->tp_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE); - ifp->if_opackets++; - } while (sc->sc_txt.tf_ready > THT_FIFO_DESC_LEN); tht_fifo_post(sc, &sc->sc_txt); Index: dev/pci/if_tl.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_tl.c,v retrieving revision 1.69 diff -u -p -r1.69 if_tl.c --- dev/pci/if_tl.c 13 Apr 2016 10:34:32 -0000 1.69 +++ dev/pci/if_tl.c 22 Jan 2017 06:51:36 -0000 @@ -1326,7 +1326,6 @@ tl_stats_update(void *xsc) *p++ = CSR_READ_4(sc, TL_DIO_DATA); *p++ = CSR_READ_4(sc, TL_DIO_DATA); - ifp->if_opackets += tl_tx_goodframes(tl_stats); ifp->if_collisions += tl_stats.tl_tx_single_collision + tl_stats.tl_tx_multi_collision; ifp->if_ierrors += tl_stats.tl_crc_errors + tl_stats.tl_code_errors + Index: dev/pci/if_txp.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_txp.c,v retrieving revision 1.124 diff -u -p -r1.124 if_txp.c --- dev/pci/if_txp.c 13 Apr 2016 10:34:32 -0000 1.124 +++ dev/pci/if_txp.c 22 Jan 2017 06:51:36 -0000 @@ -818,7 +818,6 @@ txp_tx_reclaim(struct txp_softc *sc, str m_freem(m); txd->tx_addrlo = 0; txd->tx_addrhi = 0; - ifp->if_opackets++; } } ifq_clr_oactive(&ifp->if_snd); @@ -1247,7 +1246,6 @@ txp_tick(void *vsc) ext[2].ext_1; ifp->if_collisions += ext[0].ext_2 + ext[0].ext_3 + ext[1].ext_2 + ext[1].ext_3; - ifp->if_opackets += rsp->rsp_par2; out: if (rsp != NULL) Index: dev/pci/if_vge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_vge.c,v retrieving revision 1.70 diff -u -p -r1.70 if_vge.c --- dev/pci/if_vge.c 13 Apr 2016 10:34:32 -0000 1.70 +++ dev/pci/if_vge.c 22 Jan 2017 06:51:36 -0000 @@ -1181,8 +1181,6 @@ vge_txeof(struct vge_softc *sc) ifp->if_collisions++; if (txstat & VGE_TDSTS_TXERR) ifp->if_oerrors++; - else - ifp->if_opackets++; sc->vge_ldata.vge_tx_free++; VGE_TX_DESC_INC(idx); Index: dev/pci/if_vic.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_vic.c,v retrieving revision 1.96 diff -u -p -r1.96 if_vic.c --- dev/pci/if_vic.c 13 Apr 2016 10:34:32 -0000 1.96 +++ dev/pci/if_vic.c 22 Jan 2017 06:51:36 -0000 @@ -1109,7 +1109,6 @@ vic_start(struct ifnet *ifp) bus_dmamap_sync(sc->sc_dmat, dmap, 0, dmap->dm_mapsize, BUS_DMASYNC_PREWRITE); - ifp->if_opackets++; sc->sc_txpending++; VIC_INC(sc->sc_data->vd_tx_nextidx, sc->sc_data->vd_tx_length); Index: dev/pci/if_vmx.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_vmx.c,v retrieving revision 1.44 diff -u -p -r1.44 if_vmx.c --- dev/pci/if_vmx.c 13 Apr 2016 10:34:32 -0000 1.44 +++ dev/pci/if_vmx.c 22 Jan 2017 06:51:36 -0000 @@ -1081,7 +1081,6 @@ vmxnet3_start(struct ifnet *ifp) /* Change the ownership by flipping the "generation" bit */ txd->tx_word2 ^= htole32(VMXNET3_TX_GEN_M << VMXNET3_TX_GEN_S); - ifp->if_opackets++; used += n; } Index: dev/pci/if_vr.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_vr.c,v retrieving revision 1.152 diff -u -p -r1.152 if_vr.c --- dev/pci/if_vr.c 13 Apr 2016 10:34:32 -0000 1.152 +++ dev/pci/if_vr.c 22 Jan 2017 06:51:36 -0000 @@ -1033,7 +1033,6 @@ vr_txeof(struct vr_softc *sc) ifp->if_collisions +=(txstat & VR_TXSTAT_COLLCNT) >> 3; - ifp->if_opackets++; if (cur_tx->vr_map != NULL && cur_tx->vr_map->dm_nsegs > 0) bus_dmamap_unload(sc->sc_dmat, cur_tx->vr_map); Index: dev/pci/if_vte.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_vte.c,v retrieving revision 1.18 diff -u -p -r1.18 if_vte.c --- dev/pci/if_vte.c 13 Apr 2016 10:34:32 -0000 1.18 +++ dev/pci/if_vte.c 22 Jan 2017 06:51:36 -0000 @@ -838,7 +838,6 @@ vte_stats_update(struct vte_softc *sc) stat->rx_pause_frames += (value & 0xFF); /* Update ifp counters. */ - ifp->if_opackets = stat->tx_frames; ifp->if_collisions = stat->tx_late_colls; ifp->if_oerrors = stat->tx_late_colls + stat->tx_underruns; ifp->if_ierrors = stat->rx_crcerrs + stat->rx_runts + Index: dev/pci/if_wb.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_wb.c,v retrieving revision 1.67 diff -u -p -r1.67 if_wb.c --- dev/pci/if_wb.c 13 Apr 2016 10:34:32 -0000 1.67 +++ dev/pci/if_wb.c 22 Jan 2017 06:51:36 -0000 @@ -1035,7 +1035,6 @@ void wb_txeof(sc) ifp->if_collisions += (txstat & WB_TXSTAT_COLLCNT) >> 3; - ifp->if_opackets++; m_freem(cur_tx->wb_mbuf); cur_tx->wb_mbuf = NULL; Index: dev/pci/if_wpi.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_wpi.c,v retrieving revision 1.137 diff -u -p -r1.137 if_wpi.c --- dev/pci/if_wpi.c 23 Dec 2016 18:44:51 -0000 1.137 +++ dev/pci/if_wpi.c 22 Jan 2017 06:51:36 -0000 @@ -1361,8 +1361,6 @@ wpi_tx_done(struct wpi_softc *sc, struct if ((letoh32(stat->status) & 0xff) != 1) ifp->if_oerrors++; - else - ifp->if_opackets++; /* Unmap and free mbuf. */ bus_dmamap_sync(sc->sc_dmat, data->map, 0, data->map->dm_mapsize, Index: dev/pci/if_xge.c =================================================================== RCS file: /cvs/src/sys/dev/pci/if_xge.c,v retrieving revision 1.74 diff -u -p -r1.74 if_xge.c --- dev/pci/if_xge.c 29 Nov 2016 10:22:30 -0000 1.74 +++ dev/pci/if_xge.c 22 Jan 2017 06:51:36 -0000 @@ -901,7 +901,6 @@ xge_intr(void *pv) } bus_dmamap_unload(sc->sc_dmat, dmp); m_freem(sc->sc_txb[i]); - ifp->if_opackets++; sc->sc_lasttx = i; } Index: dev/pcmcia/if_malo.c =================================================================== RCS file: /cvs/src/sys/dev/pcmcia/if_malo.c,v retrieving revision 1.91 diff -u -p -r1.91 if_malo.c --- dev/pcmcia/if_malo.c 13 Apr 2016 10:49:26 -0000 1.91 +++ dev/pcmcia/if_malo.c 22 Jan 2017 06:51:36 -0000 @@ -1066,7 +1066,6 @@ cmalo_tx_done(struct malo_softc *sc) DPRINTF(2, "%s: TX done\n", sc->sc_dev.dv_xname); - ifp->if_opackets++; ifq_clr_oactive(&ifp->if_snd); ifp->if_timer = 0; cmalo_start(ifp); Index: dev/pcmcia/if_xe.c =================================================================== RCS file: /cvs/src/sys/dev/pcmcia/if_xe.c,v retrieving revision 1.58 diff -u -p -r1.58 if_xe.c --- dev/pcmcia/if_xe.c 13 Apr 2016 10:49:26 -0000 1.58 +++ dev/pcmcia/if_xe.c 22 Jan 2017 06:51:36 -0000 @@ -722,7 +722,7 @@ xe_intr(arg) xe_start(ifp); /* Detected excessive collisions? */ - if ((tx_status & EXCESSIVE_COLL) && ifp->if_opackets > 0) { + if (tx_status & EXCESSIVE_COLL) { DPRINTF(XED_INTR, ("%s: excessive collisions\n", sc->sc_dev.dv_xname)); bus_space_write_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + CR, @@ -730,7 +730,7 @@ xe_intr(arg) ifp->if_oerrors++; } - if ((tx_status & TX_ABORT) && ifp->if_opackets > 0) + if (tx_status & TX_ABORT) ifp->if_oerrors++; end: @@ -1149,7 +1149,6 @@ xe_start(ifp) splx(s); ifp->if_timer = 5; - ++ifp->if_opackets; } int Index: dev/pv/if_hvn.c =================================================================== RCS file: /cvs/src/sys/dev/pv/if_hvn.c,v retrieving revision 1.30 diff -u -p -r1.30 if_hvn.c --- dev/pv/if_hvn.c 18 Jan 2017 17:22:46 -0000 1.30 +++ dev/pv/if_hvn.c 22 Jan 2017 06:51:36 -0000 @@ -481,8 +481,6 @@ hvn_start(struct ifnet *ifp) } sc->sc_tx_next++; - - ifp->if_opackets++; } } Index: dev/pv/if_vio.c =================================================================== RCS file: /cvs/src/sys/dev/pv/if_vio.c,v retrieving revision 1.1 diff -u -p -r1.1 if_vio.c --- dev/pv/if_vio.c 21 Jan 2017 11:21:28 -0000 1.1 +++ dev/pv/if_vio.c 22 Jan 2017 06:51:36 -0000 @@ -1148,7 +1148,6 @@ vio_txeof(struct virtqueue *vq) bus_dmamap_unload(vsc->sc_dmat, sc->sc_tx_dmamaps[slot]); sc->sc_tx_mbufs[slot] = 0; virtio_dequeue_commit(vq, slot); - ifp->if_opackets++; m_freem(m); } Index: dev/pv/if_xnf.c =================================================================== RCS file: /cvs/src/sys/dev/pv/if_xnf.c,v retrieving revision 1.46 diff -u -p -r1.46 if_xnf.c --- dev/pv/if_xnf.c 5 Jan 2017 13:23:51 -0000 1.46 +++ dev/pv/if_xnf.c 22 Jan 2017 06:51:36 -0000 @@ -510,7 +510,6 @@ xnf_start(struct ifnet *ifp) m_freem(m); continue; } - ifp->if_opackets++; #if NBPFILTER > 0 if (ifp->if_bpf) Index: dev/sbus/be.c =================================================================== RCS file: /cvs/src/sys/dev/sbus/be.c,v retrieving revision 1.41 diff -u -p -r1.41 be.c --- dev/sbus/be.c 13 Apr 2016 11:36:00 -0000 1.41 +++ dev/sbus/be.c 22 Jan 2017 06:51:36 -0000 @@ -850,7 +850,6 @@ betint(struct be_softc *sc) break; ifq_clr_oactive(&ifp->if_snd); - ifp->if_opackets++; if (++bix == QEC_XD_RING_MAXSIZE) bix = 0; Index: dev/sbus/qe.c =================================================================== RCS file: /cvs/src/sys/dev/sbus/qe.c,v retrieving revision 1.39 diff -u -p -r1.39 qe.c --- dev/sbus/qe.c 13 Apr 2016 11:36:00 -0000 1.39 +++ dev/sbus/qe.c 22 Jan 2017 06:51:36 -0000 @@ -627,7 +627,6 @@ qe_tint(sc) break; ifq_clr_oactive(&ifp->if_snd); - ifp->if_opackets++; if (++bix == QEC_XD_RING_MAXSIZE) bix = 0; Index: dev/usb/if_athn_usb.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_athn_usb.c,v retrieving revision 1.44 diff -u -p -r1.44 if_athn_usb.c --- dev/usb/if_athn_usb.c 12 Jan 2017 16:32:28 -0000 1.44 +++ dev/usb/if_athn_usb.c 22 Jan 2017 06:51:36 -0000 @@ -1918,7 +1918,6 @@ athn_usb_txeof(struct usbd_xfer *xfer, v return; } sc->sc_tx_timer = 0; - ifp->if_opackets++; /* We just released a Tx buffer, notify Tx. */ if (ifq_is_oactive(&ifp->if_snd)) { Index: dev/usb/if_atu.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_atu.c,v retrieving revision 1.120 diff -u -p -r1.120 if_atu.c --- dev/usb/if_atu.c 6 Nov 2016 12:58:01 -0000 1.120 +++ dev/usb/if_atu.c 22 Jan 2017 06:51:36 -0000 @@ -1775,8 +1775,6 @@ atu_txeof(struct usbd_xfer *xfer, void * if (err) ifp->if_oerrors++; - else - ifp->if_opackets++; s = splnet(); SLIST_INSERT_HEAD(&sc->atu_cdata.atu_tx_free, c, atu_list); Index: dev/usb/if_aue.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_aue.c,v retrieving revision 1.105 diff -u -p -r1.105 if_aue.c --- dev/usb/if_aue.c 13 Apr 2016 11:03:37 -0000 1.105 +++ dev/usb/if_aue.c 22 Jan 2017 06:51:36 -0000 @@ -1111,8 +1111,6 @@ aue_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->aue_mbuf); c->aue_mbuf = NULL; Index: dev/usb/if_axe.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_axe.c,v retrieving revision 1.137 diff -u -p -r1.137 if_axe.c --- dev/usb/if_axe.c 13 Apr 2016 11:03:37 -0000 1.137 +++ dev/usb/if_axe.c 22 Jan 2017 06:51:36 -0000 @@ -1130,7 +1130,6 @@ axe_txeof(struct usbd_xfer *xfer, void * if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) axe_start(ifp); - ifp->if_opackets++; splx(s); return; } Index: dev/usb/if_axen.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_axen.c,v retrieving revision 1.23 diff -u -p -r1.23 if_axen.c --- dev/usb/if_axen.c 14 Sep 2016 12:41:09 -0000 1.23 +++ dev/usb/if_axen.c 22 Jan 2017 06:51:36 -0000 @@ -1086,7 +1086,6 @@ axen_txeof(struct usbd_xfer *xfer, void if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) axen_start(ifp); - ifp->if_opackets++; splx(s); } Index: dev/usb/if_cdce.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_cdce.c,v retrieving revision 1.72 diff -u -p -r1.72 if_cdce.c --- dev/usb/if_cdce.c 12 Oct 2016 21:51:11 -0000 1.72 +++ dev/usb/if_cdce.c 22 Jan 2017 06:51:36 -0000 @@ -814,8 +814,6 @@ cdce_txeof(struct usbd_xfer *xfer, void if (err) ifp->if_oerrors++; - else - ifp->if_opackets++; if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) cdce_start(ifp); Index: dev/usb/if_cue.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_cue.c,v retrieving revision 1.76 diff -u -p -r1.76 if_cue.c --- dev/usb/if_cue.c 6 Nov 2016 12:58:01 -0000 1.76 +++ dev/usb/if_cue.c 22 Jan 2017 06:51:36 -0000 @@ -770,8 +770,6 @@ cue_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->cue_mbuf); c->cue_mbuf = NULL; Index: dev/usb/if_kue.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_kue.c,v retrieving revision 1.85 diff -u -p -r1.85 if_kue.c --- dev/usb/if_kue.c 13 Apr 2016 11:03:37 -0000 1.85 +++ dev/usb/if_kue.c 22 Jan 2017 06:51:36 -0000 @@ -784,8 +784,6 @@ kue_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->kue_mbuf); c->kue_mbuf = NULL; Index: dev/usb/if_mos.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_mos.c,v retrieving revision 1.37 diff -u -p -r1.37 if_mos.c --- dev/usb/if_mos.c 6 Nov 2016 12:58:01 -0000 1.37 +++ dev/usb/if_mos.c 22 Jan 2017 06:51:36 -0000 @@ -1022,7 +1022,6 @@ mos_txeof(struct usbd_xfer *xfer, void * if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) mos_start(ifp); - ifp->if_opackets++; splx(s); return; } Index: dev/usb/if_otus.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_otus.c,v retrieving revision 1.54 diff -u -p -r1.54 if_otus.c --- dev/usb/if_otus.c 6 Nov 2016 12:58:01 -0000 1.54 +++ dev/usb/if_otus.c 22 Jan 2017 06:51:36 -0000 @@ -1257,7 +1257,6 @@ otus_txeof(struct usbd_xfer *xfer, void return; } sc->sc_tx_timer = 0; - ifp->if_opackets++; ifq_clr_oactive(&ifp->if_snd); otus_start(ifp); splx(s); Index: dev/usb/if_ral.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_ral.c,v retrieving revision 1.141 diff -u -p -r1.141 if_ral.c --- dev/usb/if_ral.c 6 Nov 2016 12:58:01 -0000 1.141 +++ dev/usb/if_ral.c 22 Jan 2017 06:51:36 -0000 @@ -681,7 +681,6 @@ ural_txeof(struct usbd_xfer *xfer, void data->ni = NULL; sc->tx_queued--; - ifp->if_opackets++; DPRINTFN(10, ("tx done\n")); Index: dev/usb/if_rsu.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_rsu.c,v retrieving revision 1.36 diff -u -p -r1.36 if_rsu.c --- dev/usb/if_rsu.c 26 Jul 2016 18:18:04 -0000 1.36 +++ dev/usb/if_rsu.c 22 Jan 2017 06:51:36 -0000 @@ -1453,7 +1453,6 @@ rsu_txeof(struct usbd_xfer *xfer, void * return; } sc->sc_tx_timer = 0; - ifp->if_opackets++; /* We just released a Tx buffer, notify Tx. */ if (ifq_is_oactive(&ifp->if_snd)) { Index: dev/usb/if_rum.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_rum.c,v retrieving revision 1.119 diff -u -p -r1.119 if_rum.c --- dev/usb/if_rum.c 13 Apr 2016 11:03:37 -0000 1.119 +++ dev/usb/if_rum.c 22 Jan 2017 06:51:36 -0000 @@ -742,7 +742,6 @@ rum_txeof(struct usbd_xfer *xfer, void * data->ni = NULL; sc->tx_queued--; - ifp->if_opackets++; DPRINTFN(10, ("tx done\n")); Index: dev/usb/if_run.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_run.c,v retrieving revision 1.116 diff -u -p -r1.116 if_run.c --- dev/usb/if_run.c 13 Apr 2016 11:03:37 -0000 1.116 +++ dev/usb/if_run.c 22 Jan 2017 06:51:37 -0000 @@ -2374,7 +2374,6 @@ run_txeof(struct usbd_xfer *xfer, void * } sc->sc_tx_timer = 0; - ifp->if_opackets++; ifq_clr_oactive(&ifp->if_snd); run_start(ifp); splx(s); Index: dev/usb/if_smsc.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_smsc.c,v retrieving revision 1.28 diff -u -p -r1.28 if_smsc.c --- dev/usb/if_smsc.c 31 Jul 2016 12:51:49 -0000 1.28 +++ dev/usb/if_smsc.c 22 Jan 2017 06:51:37 -0000 @@ -1262,7 +1262,6 @@ smsc_txeof(struct usbd_xfer *xfer, void if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) smsc_start(ifp); - ifp->if_opackets++; splx(s); } Index: dev/usb/if_uath.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_uath.c,v retrieving revision 1.78 diff -u -p -r1.78 if_uath.c --- dev/usb/if_uath.c 6 Nov 2016 12:58:01 -0000 1.78 +++ dev/usb/if_uath.c 22 Jan 2017 06:51:37 -0000 @@ -1334,7 +1334,6 @@ uath_data_txeof(struct usbd_xfer *xfer, data->ni = NULL; sc->tx_queued--; - ifp->if_opackets++; sc->sc_tx_timer = 0; ifq_clr_oactive(&ifp->if_snd); Index: dev/usb/if_udav.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_udav.c,v retrieving revision 1.78 diff -u -p -r1.78 if_udav.c --- dev/usb/if_udav.c 13 Apr 2016 11:03:37 -0000 1.78 +++ dev/usb/if_udav.c 22 Jan 2017 06:51:37 -0000 @@ -1025,8 +1025,6 @@ udav_txeof(struct usbd_xfer *xfer, void return; } - ifp->if_opackets++; - m_freem(c->udav_mbuf); c->udav_mbuf = NULL; Index: dev/usb/if_ugl.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_ugl.c,v retrieving revision 1.20 diff -u -p -r1.20 if_ugl.c --- dev/usb/if_ugl.c 13 Apr 2016 11:03:37 -0000 1.20 +++ dev/usb/if_ugl.c 22 Jan 2017 06:51:37 -0000 @@ -526,8 +526,6 @@ ugl_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->ugl_mbuf); c->ugl_mbuf = NULL; Index: dev/usb/if_umb.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_umb.c,v retrieving revision 1.8 diff -u -p -r1.8 if_umb.c --- dev/usb/if_umb.c 25 Nov 2016 12:43:26 -0000 1.8 +++ dev/usb/if_umb.c 22 Jan 2017 06:51:37 -0000 @@ -1774,7 +1774,6 @@ umb_txeof(struct usbd_xfer *xfer, void * usbd_clear_endpoint_stall_async(sc->sc_tx_pipe); } } else { - ifp->if_opackets++; if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) umb_start(ifp); } Index: dev/usb/if_upgt.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_upgt.c,v retrieving revision 1.78 diff -u -p -r1.78 if_upgt.c --- dev/usb/if_upgt.c 6 Nov 2016 12:58:01 -0000 1.78 +++ dev/usb/if_upgt.c 22 Jan 2017 06:51:37 -0000 @@ -1604,7 +1604,6 @@ upgt_tx_done(struct upgt_softc *sc, uint data_tx->addr = 0; sc->tx_queued--; - ifp->if_opackets++; DPRINTF(2, "%s: TX done: ", sc->sc_dev.dv_xname); DPRINTF(2, "memaddr=0x%08x, status=0x%04x, rssi=%d, ", Index: dev/usb/if_upl.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_upl.c,v retrieving revision 1.72 diff -u -p -r1.72 if_upl.c --- dev/usb/if_upl.c 6 Nov 2016 12:58:01 -0000 1.72 +++ dev/usb/if_upl.c 22 Jan 2017 06:51:37 -0000 @@ -507,8 +507,6 @@ upl_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->upl_mbuf); c->upl_mbuf = NULL; Index: dev/usb/if_ure.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_ure.c,v retrieving revision 1.2 diff -u -p -r1.2 if_ure.c --- dev/usb/if_ure.c 7 Aug 2016 00:21:57 -0000 1.2 +++ dev/usb/if_ure.c 22 Jan 2017 06:51:37 -0000 @@ -1156,7 +1156,6 @@ ure_txeof(struct usbd_xfer *xfer, void * if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) ure_start(ifp); - ifp->if_opackets++; splx(s); } Index: dev/usb/if_url.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_url.c,v retrieving revision 1.81 diff -u -p -r1.81 if_url.c --- dev/usb/if_url.c 6 Nov 2016 12:58:01 -0000 1.81 +++ dev/usb/if_url.c 22 Jan 2017 06:51:37 -0000 @@ -885,8 +885,6 @@ url_txeof(struct usbd_xfer *xfer, void * return; } - ifp->if_opackets++; - m_freem(c->url_mbuf); c->url_mbuf = NULL; Index: dev/usb/if_urndis.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_urndis.c,v retrieving revision 1.62 diff -u -p -r1.62 if_urndis.c --- dev/usb/if_urndis.c 16 Sep 2016 11:13:37 -0000 1.62 +++ dev/usb/if_urndis.c 22 Jan 2017 06:51:37 -0000 @@ -1271,8 +1271,6 @@ urndis_txeof(struct usbd_xfer *xfer, if (err) ifp->if_oerrors++; - else - ifp->if_opackets++; if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) urndis_start(ifp); Index: dev/usb/if_urtw.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_urtw.c,v retrieving revision 1.63 diff -u -p -r1.63 if_urtw.c --- dev/usb/if_urtw.c 9 Jan 2017 14:44:28 -0000 1.63 +++ dev/usb/if_urtw.c 22 Jan 2017 06:51:37 -0000 @@ -2524,7 +2524,6 @@ urtw_txeof_low(struct usbd_xfer *xfer, v data->ni = NULL; sc->sc_txtimer = 0; - ifp->if_opackets++; sc->sc_tx_low_queued--; ifq_clr_oactive(&ifp->if_snd); @@ -2563,7 +2562,6 @@ urtw_txeof_normal(struct usbd_xfer *xfer data->ni = NULL; sc->sc_txtimer = 0; - ifp->if_opackets++; sc->sc_tx_normal_queued--; ifq_clr_oactive(&ifp->if_snd); Index: dev/usb/if_urtwn.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_urtwn.c,v retrieving revision 1.67 diff -u -p -r1.67 if_urtwn.c --- dev/usb/if_urtwn.c 8 Jan 2017 05:48:27 -0000 1.67 +++ dev/usb/if_urtwn.c 22 Jan 2017 06:51:37 -0000 @@ -1237,7 +1237,6 @@ urtwn_txeof(struct usbd_xfer *xfer, void return; } sc->sc_sc.sc_tx_timer = 0; - ifp->if_opackets++; /* We just released a Tx buffer, notify Tx. */ if (ifq_is_oactive(&ifp->if_snd)) { Index: dev/usb/if_zyd.c =================================================================== RCS file: /cvs/src/sys/dev/usb/if_zyd.c,v retrieving revision 1.115 diff -u -p -r1.115 if_zyd.c --- dev/usb/if_zyd.c 13 Apr 2016 11:03:37 -0000 1.115 +++ dev/usb/if_zyd.c 22 Jan 2017 06:51:37 -0000 @@ -2079,7 +2079,6 @@ zyd_txeof(struct usbd_xfer *xfer, void * data->ni = NULL; sc->tx_queued--; - ifp->if_opackets++; sc->tx_timer = 0; ifq_clr_oactive(&ifp->if_snd); Index: net/if.c =================================================================== RCS file: /cvs/src/sys/net/if.c,v retrieving revision 1.474 diff -u -p -r1.474 if.c --- net/if.c 12 Jan 2017 09:07:46 -0000 1.474 +++ net/if.c 22 Jan 2017 06:51:37 -0000 @@ -610,6 +610,7 @@ if_enqueue(struct ifnet *ifp, struct mbu if (error) return (error); + ifp->if_opackets++; ifp->if_obytes += length; if (mflags & M_MCAST) ifp->if_omcasts++; Index: net/if_etherip.c =================================================================== RCS file: /cvs/src/sys/net/if_etherip.c,v retrieving revision 1.10 diff -u -p -r1.10 if_etherip.c --- net/if_etherip.c 13 Dec 2016 06:51:11 -0000 1.10 +++ net/if_etherip.c 22 Jan 2017 06:51:37 -0000 @@ -185,8 +185,6 @@ etherip_start(struct ifnet *ifp) continue; } - ifp->if_opackets++; - switch (sc->sc_src.ss_family) { case AF_INET: error = ip_etherip_output(ifp, m); Index: net/if_gif.c =================================================================== RCS file: /cvs/src/sys/net/if_gif.c,v retrieving revision 1.87 diff -u -p -r1.87 if_gif.c --- net/if_gif.c 13 Dec 2016 06:51:11 -0000 1.87 +++ net/if_gif.c 22 Jan 2017 06:51:37 -0000 @@ -226,7 +226,6 @@ gif_start(struct ifnet *ifp) m->m_pkthdr.len += offset; } #endif - ifp->if_opackets++; /* XXX we should cache the outgoing route */ Index: net/if_pair.c =================================================================== RCS file: /cvs/src/sys/net/if_pair.c,v retrieving revision 1.8 diff -u -p -r1.8 if_pair.c --- net/if_pair.c 29 Nov 2016 10:09:57 -0000 1.8 +++ net/if_pair.c 22 Jan 2017 06:51:37 -0000 @@ -180,7 +180,6 @@ pairstart(struct ifnet *ifp) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT); #endif /* NBPFILTER > 0 */ - ifp->if_opackets++; if (pairedifp != NULL) { if (m->m_flags & M_PKTHDR) m_resethdr(m); Index: net/if_pppoe.c =================================================================== RCS file: /cvs/src/sys/net/if_pppoe.c,v retrieving revision 1.59 diff -u -p -r1.59 if_pppoe.c --- net/if_pppoe.c 2 Jan 2017 08:44:13 -0000 1.59 +++ net/if_pppoe.c 22 Jan 2017 06:51:37 -0000 @@ -778,7 +778,6 @@ pppoe_output(struct pppoe_softc *sc, str /* encapsulated packet is forced into rdomain of physical interface */ m->m_pkthdr.ph_rtableid = eth_if->if_rdomain; - sc->sc_sppp.pp_if.if_opackets++; ret = eth_if->if_output(eth_if, m, &dst, NULL); if_put(eth_if); Index: net/if_trunk.c =================================================================== RCS file: /cvs/src/sys/net/if_trunk.c,v retrieving revision 1.128 diff -u -p -r1.128 if_trunk.c --- net/if_trunk.c 16 Sep 2016 09:51:21 -0000 1.128 +++ net/if_trunk.c 22 Jan 2017 06:51:37 -0000 @@ -934,9 +934,7 @@ trunk_start(struct ifnet *ifp) if (tr->tr_proto != TRUNK_PROTO_NONE && tr->tr_count) { error = (*tr->tr_start)(tr, m); - if (error == 0) - ifp->if_opackets++; - else + if (error != 0) ifp->if_oerrors++; } else { m_freem(m); Index: net/if_tun.c =================================================================== RCS file: /cvs/src/sys/net/if_tun.c,v retrieving revision 1.171 diff -u -p -r1.171 if_tun.c --- net/if_tun.c 21 Dec 2016 13:13:01 -0000 1.171 +++ net/if_tun.c 22 Jan 2017 06:51:37 -0000 @@ -590,7 +590,6 @@ tun_output(struct ifnet *ifp, struct mbu ifp->if_collisions++; return (error); } - ifp->if_opackets++; tun_wakeup(tp); return (0); @@ -832,7 +831,6 @@ tun_dev_read(struct tun_softc *tp, struc if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m0, BPF_DIRECTION_OUT); #endif - ifp->if_opackets++; } while (m0 != NULL && uio->uio_resid > 0 && error == 0) { Index: net/if_vether.c =================================================================== RCS file: /cvs/src/sys/net/if_vether.c,v retrieving revision 1.28 diff -u -p -r1.28 if_vether.c --- net/if_vether.c 29 Nov 2016 10:09:57 -0000 1.28 +++ net/if_vether.c 22 Jan 2017 06:51:37 -0000 @@ -133,7 +133,6 @@ vetherstart(struct ifnet *ifp) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT); #endif /* NBPFILTER > 0 */ - ifp->if_opackets++; m_freem(m); } } Index: net/if_vlan.c =================================================================== RCS file: /cvs/src/sys/net/if_vlan.c,v retrieving revision 1.167 diff -u -p -r1.167 if_vlan.c --- net/if_vlan.c 10 Oct 2016 02:44:17 -0000 1.167 +++ net/if_vlan.c 22 Jan 2017 06:51:37 -0000 @@ -298,7 +298,6 @@ vlan_start(struct ifnet *ifp) ifp->if_oerrors++; continue; } - ifp->if_opackets++; } leave: Index: net/if_vxlan.c =================================================================== RCS file: /cvs/src/sys/net/if_vxlan.c,v retrieving revision 1.56 diff -u -p -r1.56 if_vxlan.c --- net/if_vxlan.c 4 Jan 2017 12:49:49 -0000 1.56 +++ net/if_vxlan.c 22 Jan 2017 06:51:37 -0000 @@ -310,8 +310,6 @@ vxlanstart(struct ifnet *ifp) if (m == NULL) return; - ifp->if_opackets++; - #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);