Increment if_ipackets in if_input().

Note that pseudo-drivers not using if_input() are not affected by this
conversion.

ok mikeb@, kettenis@, claudio@, dlg@

38 files changed, 38 insertions, 98 deletions

diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index e73c408623c..b020bdbac36 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.27 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.28 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -1958,8 +1958,6 @@ age_stats_update(struct age_softc *sc)
 	    smb->tx_late_colls + smb->tx_underrun +
 	    smb->tx_pkts_truncated;
 
-	ifp->if_ipackets += smb->rx_frames;
-
 	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_desc_oflows +
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index c18df3db820..1fe1d168780 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.32 2015/03/20 16:48:13 mpi Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.33 2015/06/24 09:40:54 mpi Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -1655,8 +1655,6 @@ alc_stats_update(struct alc_softc *sc)
 	ifp->if_oerrors += smb->tx_late_colls + smb->tx_excess_colls +
 	    smb->tx_underrun + smb->tx_pkts_truncated;
 
-	ifp->if_ipackets += smb->rx_frames;
-
 	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index f7947878ff5..a8a5a3c6789 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.38 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.39 2015/06/24 09:40:54 mpi Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -1251,8 +1251,6 @@ ale_stats_update(struct ale_softc *sc)
 	ifp->if_oerrors += smb->tx_late_colls + smb->tx_excess_colls +
 	    smb->tx_underrun + smb->tx_pkts_truncated;
 
-	ifp->if_ipackets += smb->rx_frames;
-
 	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 6f06ab072cb..dec598999b7 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.45 2015/04/13 08:45:48 mpi Exp $ */
+/* $OpenBSD: if_bce.c,v 1.46 2015/06/24 09:40:54 mpi Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -740,7 +740,6 @@ bce_rxintr(struct bce_softc *sc)
 
 		m = m_devget(sc->bce_data + i * MCLBYTES +
 		    BCE_PREPKT_HEADER_SIZE, len, ETHER_ALIGN);
-		ifp->if_ipackets++;
 
 		ml_enqueue(&ml, m);
 
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 60660dccff9..990d4c4657e 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.367 2015/05/19 12:50:53 mikeb Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.368 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -3497,7 +3497,6 @@ bge_rxeof(struct bge_softc *sc)
 			}
 		}
 
-		ifp->if_ipackets++;
 #ifdef __STRICT_ALIGNMENT
 		/*
 		 * The i386 allows unaligned accesses, but for other
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 8774cfcf988..9d1249ea436 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnx.c,v 1.110 2015/03/10 15:28:48 mpi Exp $	*/
+/*	$OpenBSD: if_bnx.c,v 1.111 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -4478,9 +4478,6 @@ bnx_rx_intr(struct bnx_softc *sc)
 #endif			
 			}
 
-			/* Pass the mbuf off to the upper layers. */
-			ifp->if_ipackets++;
-
 bnx_rx_int_next_rx:
 			sw_prod = NEXT_RX_BD(sw_prod);
 		}
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index 19c9e0c1554..83d532514af 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cas.c,v 1.40 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_cas.c,v 1.41 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  *
@@ -1202,7 +1202,6 @@ cas_rint(struct cas_softc *sc)
 				cas_add_rxbuf(sc, idx);
 
 			if (m != NULL) {
-				ifp->if_ipackets++;
 				ml_enqueue(&ml, m);
 			} else
 				ifp->if_ierrors++;
@@ -1228,7 +1227,6 @@ cas_rint(struct cas_softc *sc)
 				cas_add_rxbuf(sc, idx);
 
 			if (m != NULL) {
-				ifp->if_ipackets++;
 				ml_enqueue(&ml, m);
 			} else
 				ifp->if_ierrors++;
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index bfc8d8e4260..a6d3d9a82b8 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.120 2015/05/15 11:36:30 mpi Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.121 2015/06/24 09:40:54 mpi Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -3327,7 +3327,6 @@ tulip_rx_intr(tulip_softc_t * const sc)
 #if defined(TULIP_DEBUG)
 	cnt++;
 #endif
-	ifp->if_ipackets++;
 	if (++eop == ri->ri_last)
 	    eop = ri->ri_first;
 	ri->ri_nextin = eop;
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index efc3f7f3ad5..de174d95ba9 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.298 2015/06/04 18:33:41 dms Exp $ */
+/* $OpenBSD: if_em.c,v 1.299 2015/06/24 09:40:54 mpi Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -2969,8 +2969,6 @@ em_rxeof(struct em_softc *sc)
 			}
 
 			if (eop) {
-				ifp->if_ipackets++;
-
 				m = sc->fmp;
 
 				em_receive_checksum(sc, desc, m);
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 7e63cea4725..6c7e56470e5 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.27 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.28 2015/06/24 09:40:54 mpi Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -1746,7 +1746,6 @@ et_rxeof(struct et_softc *sc)
 				m->m_pkthdr.len = m->m_len = buflen -
 				    ETHER_CRC_LEN;
 				ml_enqueue(&ml, m);
-				ifp->if_ipackets++;
 			}
 		} else {
 			ifp->if_ierrors++;
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index a6085689931..c2f7d29d053 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.120 2015/05/21 07:39:52 gerhard Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.121 2015/06/24 09:40:54 mpi Exp $	*/
 
 /******************************************************************************
 
@@ -2919,7 +2919,6 @@ ixgbe_rxeof(struct ix_queue *que)
 			sendmp = NULL;
 			mp->m_next = nxbuf->buf;
 		} else { /* Sending this frame? */
-			ifp->if_ipackets++;
 			rxr->rx_packets++;
 			/* capture data for AIM */
 			rxr->bytes += sendmp->m_pkthdr.len;
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index a6e54d0b1de..9bebe61ad34 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.64 2015/04/30 07:51:07 mpi Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.65 2015/06/24 09:40:54 mpi Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -1770,7 +1770,6 @@ ixgb_rxeof(struct ixgb_softc *sc, int count)
 
 			if (eop) {
 				eop_desc = i;
-				ifp->if_ipackets++;
 				ixgb_receive_checksum(sc, current_desc, sc->fmp);
 
 #if NVLAN > 0
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index e8a08f4855c..74f70e5e55f 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.40 2015/04/30 07:52:00 mpi Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.41 2015/06/24 09:40:54 mpi Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -1726,8 +1726,6 @@ jme_rxpkt(struct jme_softc *sc)
 			}
 #endif
 
-			ifp->if_ipackets++;
-
 			ml_enqueue(&ml, m);
 
 			/* Reset mbuf chains. */
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 5c33421ca02..b68176610d7 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.66 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.67 2015/06/24 09:40:54 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -730,8 +730,6 @@ lge_rxeof(struct lge_softc *sc, int cnt)
 			m->m_pkthdr.len = m->m_len = total_len;
 		}
 
-		ifp->if_ipackets++;
-
 		/* Do IP checksum checking. */
 		if (rxsts & LGE_RXSTS_ISIP) {
 			if (!(rxsts & LGE_RXSTS_IPCSUMERR))
diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c
index 519d9e80806..88adc7016c9 100644
--- a/sys/dev/pci/if_lii.c
+++ b/sys/dev/pci/if_lii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lii.c,v 1.36 2015/04/11 14:40:42 jsing Exp $	*/
+/*	$OpenBSD: if_lii.c,v 1.37 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  *  Copyright (c) 2007 The NetBSD Foundation.
@@ -933,7 +933,6 @@ lii_rxintr(struct lii_softc *sc)
 		/* Copy the packet withhout the FCS */
 		m->m_pkthdr.len = m->m_len = size;
 		memcpy(mtod(m, void *), &rxp->rxp_data[0], size);
-		++ifp->if_ipackets;
 
 		ml_enqueue(&ml, m);
 	}
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index cde67d0b0bb..3f7bbbc3f47 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.114 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.115 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1669,8 +1669,6 @@ msk_rxeof(struct sk_if_softc *sc_if, u_int16_t len, u_int32_t rxstat)
 	m->m_pkthdr.len = m->m_len = total_len;
 
 	ml_enqueue(&ml, m);
-	ifp->if_ipackets++;
-
 	if_input(ifp, &ml);
 }
 
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index ff9e09d3bc6..2affae02057 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_myx.c,v 1.77 2015/05/17 02:33:09 chris Exp $	*/
+/*	$OpenBSD: if_myx.c,v 1.78 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1886,8 +1886,6 @@ myx_rxeof(struct myx_softc *sc)
 			timeout_add(&sc->sc_refill, 0);
 	}
 
-	ifp->if_ipackets += ml_len(&ml);
-
 	if_input(ifp, &ml);
 }
 
diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c
index 63166932c53..50caf2bc240 100644
--- a/sys/dev/pci/if_nep.c
+++ b/sys/dev/pci/if_nep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nep.c,v 1.18 2015/04/13 20:02:58 kettenis Exp $	*/
+/*	$OpenBSD: if_nep.c,v 1.19 2015/06/24 09:40:54 mpi Exp $	*/
 /*
  * Copyright (c) 2014, 2015 Mark Kettenis
  *
@@ -1029,7 +1029,6 @@ nep_rx_proc(struct nep_softc *sc)
 			m->m_pkthdr.len = m->m_len = len;
 			m->m_data += ETHER_ALIGN;
 
-			ifp->if_ipackets++;
 			ml_enqueue(&ml, m);
 		}
 
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 2d1cf873be7..51a2439c6e1 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.110 2015/03/20 18:42:25 mpi Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.111 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -763,7 +763,6 @@ nfe_rxeof(struct nfe_softc *sc)
 		}
 #endif
 
-		ifp->if_ipackets++;
 		ml_enqueue(&ml, m);
 
 		/* update mapping address in h/w descriptor */
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index b813dcd7d7d..bbe2c4aadb4 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.83 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.84 2015/06/24 09:40:54 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1080,8 +1080,6 @@ nge_rxeof(struct nge_softc *sc)
 		}
 #endif
 
-		ifp->if_ipackets++;
-
 #if NVLAN > 0
 		if (extsts & NGE_RXEXTSTS_VLANPKT) {
 			m->m_pkthdr.ether_vtag =
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index b77aebb23c8..2aa13db54a8 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.83 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.84 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -1628,8 +1628,6 @@ oce_rxeof(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe)
 		}
 #endif
 
-		ifp->if_ipackets++;
-
 #ifdef OCE_LRO
 		/* Try to queue to LRO */
 		if (IF_LRO_ENABLED(ifp) && !(m->m_flags & M_VLANTAG) &&
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index de5cb87dd8a..895334b3b85 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.36 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.37 2015/06/24 09:40:54 mpi Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -1415,7 +1415,6 @@ pcn_rxintr(struct pcn_softc *sc)
 		m->m_pkthdr.len = m->m_len = len;
 
 		ml_enqueue(&ml, m);
-		ifp->if_ipackets++;
 	}
 
 	/* Update the receive pointer. */
diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c
index d4cce3eb905..5f3bdb369ef 100644
--- a/sys/dev/pci/if_se.c
+++ b/sys/dev/pci/if_se.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_se.c,v 1.12 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_se.c,v 1.13 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de>
@@ -962,7 +962,6 @@ se_rxeof(struct se_softc *sc)
 		    SE_RX_BYTES(rxstat) - SE_RX_PAD_BYTES;
 
 		ml_enqueue(&ml, m);
-		ifp->if_ipackets++;
 	}
 
 	if_input(ifp, &ml);
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 54014128003..dede1d2062a 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sis.c,v 1.126 2015/04/13 08:45:48 mpi Exp $ */
+/*	$OpenBSD: if_sis.c,v 1.127 2015/06/24 09:40:54 mpi Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1434,7 +1434,6 @@ sis_rxeof(struct sis_softc *sc)
 #else
 		m->m_pkthdr.len = m->m_len = total_len;
 #endif
-		ifp->if_ipackets++;
 
 		ml_enqueue(&ml, m);
 	}
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 8a9f591b831..e21b07733fc 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.175 2015/04/30 09:25:13 mpi Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.176 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1639,7 +1639,6 @@ sk_rxeof(struct sk_if_softc *sc_if)
 		m->m_pkthdr.len = m->m_len = total_len;
 
 		ml_enqueue(&ml, m);
-		ifp->if_ipackets++;
 	}
 	sc_if->sk_cdata.sk_rx_cons = cur;
 
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index e3177f6e6ac..7050d81534a 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.58 2015/05/15 11:36:31 mpi Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.59 2015/06/24 09:40:54 mpi Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -689,7 +689,6 @@ ste_rxeof(struct ste_softc *sc)
 		m->m_pkthdr.len = m->m_len = total_len;
 
 		ml_enqueue(&ml, m);
-		ifp->if_ipackets++;
 
 		cur_rx->ste_ptr->ste_status = 0;
 		count++;
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 5afbe346e44..8b4672db272 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stge.c,v 1.60 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_stge.c,v 1.61 2015/06/24 09:40:54 mpi Exp $	*/
 /*	$NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $	*/
 
 /*-
@@ -1035,9 +1035,6 @@ stge_stats_update(struct stge_softc *sc)
 
 	(void) CSR_READ_4(sc, STGE_OctetRcvOk);
 
-	ifp->if_ipackets +=
-	    CSR_READ_4(sc, STGE_FramesRcvdOk);
-
 	ifp->if_ierrors +=
 	    (u_int) CSR_READ_2(sc, STGE_FramesLostRxErrors);
 
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 56c6ffaa1f1..e4f5c9d051d 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tht.c,v 1.131 2015/04/30 07:51:07 mpi Exp $ */
+/*	$OpenBSD: if_tht.c,v 1.132 2015/06/24 09:40:54 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -1371,9 +1371,6 @@ tht_rxd(struct tht_softc *sc)
 			tht_fifo_read(sc, &sc->sc_rxd, &pad, sizeof(pad));
 			bc -= sizeof(pad);
 		}
-
-		ifp->if_ipackets++;
-
 	} while (sc->sc_rxd.tf_ready >= sizeof(rxd));
 
 	tht_fifo_post(sc, &sc->sc_rxd);
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 499ca6a71a7..8a21fdfd824 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.63 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.64 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1330,7 +1330,6 @@ tl_stats_update(void *xsc)
 	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_ipackets += tl_rx_goodframes(tl_stats);
 	ifp->if_ierrors += tl_stats.tl_crc_errors + tl_stats.tl_code_errors +
 			    tl_rx_overrun(tl_stats);
 	ifp->if_oerrors += tl_tx_underrun(tl_stats);
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 2ac49288666..6b2e568c71e 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txp.c,v 1.115 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_txp.c,v 1.116 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001
@@ -1267,7 +1267,6 @@ txp_tick(void *vsc)
 	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;
-	ifp->if_ipackets += ext[2].ext_3;
 
 out:
 	if (rsp != NULL)
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 0db21fd640e..f5fab40cc94 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.62 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.63 2015/06/24 09:40:54 mpi Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -1119,8 +1119,6 @@ vge_rxeof(struct vge_softc *sc)
 		bcopy(m->m_data, m->m_data + ETHER_ALIGN, total_len);
 		m->m_data += ETHER_ALIGN;
 #endif
-		ifp->if_ipackets++;
-
 		/* Do RX checksumming */
 
 		/* Check IP header checksum */
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 815cc0f442b..dc32eea2b4a 100644
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vic.c,v 1.90 2015/05/29 00:37:10 uebayasi Exp $	*/
+/*	$OpenBSD: if_vic.c,v 1.91 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -862,8 +862,6 @@ vic_rx_proc(struct vic_softc *sc, int q)
 
 		m->m_pkthdr.len = m->m_len = len;
 
-		ifp->if_ipackets++;
-
 		ml_enqueue(&ml, m);
 
  nextp:
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c
index 0a39301c086..ce4f35db668 100644
--- a/sys/dev/pci/if_vio.c
+++ b/sys/dev/pci/if_vio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vio.c,v 1.32 2015/06/11 04:38:23 jsg Exp $	*/
+/*	$OpenBSD: if_vio.c,v 1.33 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -1039,7 +1039,6 @@ vio_rxeof(struct vio_softc *sc)
 		}
 
 		if (bufs_left == 0) {
-			ifp->if_ipackets++;
 			ml_enqueue(&ml, m0);
 			m0 = NULL;
 		}
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index 0f1090b1c61..91e9cb78f61 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vmx.c,v 1.29 2015/06/04 17:10:33 mikeb Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.30 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -767,7 +767,6 @@ skip_buffer:
 		}
 	}
 
-	ifp->if_ipackets += ml_len(&ml);
 	if_input(ifp, &ml);
 
 	/* XXX Should we (try to) allocate buffers for ring 2 too? */
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 6c8e302fdac..5887ac497b0 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.140 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.141 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -910,8 +910,6 @@ vr_rxeof(struct vr_softc *sc)
 		m->m_pkthdr.len = m->m_len = total_len;
 #endif
 
-		ifp->if_ipackets++;
-
 		if (sc->vr_quirks & VR_Q_CSUM &&
 		    (rxstat & VR_RXSTAT_FRAG) == 0 &&
 		    (rxctl & VR_RXCTL_IP) != 0) {
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index a226b8a03a7..cc4a3242644 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vte.c,v 1.12 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_vte.c,v 1.13 2015/06/24 09:40:54 mpi Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -849,7 +849,6 @@ vte_stats_update(struct vte_softc *sc)
 	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_ipackets = stat->rx_frames;
 	ifp->if_ierrors = stat->rx_crcerrs + stat->rx_runts +
 	    stat->rx_long_frames + stat->rx_fifo_full;
 }
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 1da679a51b1..41e7ec3c9f4 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.60 2015/04/13 08:45:48 mpi Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.61 2015/06/24 09:40:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -977,8 +977,6 @@ void wb_rxeof(sc)
 			break;
 		}
 
-		ifp->if_ipackets++;
-
 		ml_enqueue(&ml, m);
 	}
 
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 94d3de68124..bd24381cdf2 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.61 2015/04/30 07:51:07 mpi Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.62 2015/06/24 09:40:54 mpi Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -911,8 +911,6 @@ xge_intr(void *pv)
 			break;
 		}
 
-		ifp->if_ipackets++;
-
 		if (RXD_CTL1_PROTOS(val) & RXD_CTL1_P_IPv4)
 			m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
 		if (RXD_CTL1_PROTOS(val) & RXD_CTL1_P_TCP)