move counting if_opackets next to counting if_obytes in if_enqueue.

this means packets are consistently counted in one place, unlike the
many and various ways that drivers thought they should do it.

ok mpi@ deraadt@

27 files changed, 27 insertions, 65 deletions

diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index 2cc0b6c3089..c31f3d1fed7 100644
--- a/sys/dev/usb/if_athn_usb.c
+++ b/sys/dev/usb/if_athn_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.c,v 1.44 2017/01/12 16:32:28 stsp Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.45 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -1918,7 +1918,6 @@ athn_usb_txeof(struct usbd_xfer *xfer, void *priv,
 		return;
 	}
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
 
 	/* We just released a Tx buffer, notify Tx. */
 	if (ifq_is_oactive(&ifp->if_snd)) {
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index b54ddc945de..725a6dbb66b 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.120 2016/11/06 12:58:01 mpi Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.121 2017/01/22 10:17:39 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1775,8 +1775,6 @@ atu_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 
 	if (err)
 		ifp->if_oerrors++;
-	else
-		ifp->if_opackets++;
 
 	s = splnet();
 	SLIST_INSERT_HEAD(&sc->atu_cdata.atu_tx_free, c, atu_list);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 63f7e29ce5f..d43ec0e5acb 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.105 2016/04/13 11:03:37 mpi Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.106 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1111,8 +1111,6 @@ aue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->aue_mbuf);
 	c->aue_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 484c33ed1df..8d197a19b2b 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.138 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -1130,7 +1130,6 @@ axe_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		axe_start(ifp);
 
-	ifp->if_opackets++;
 	splx(s);
 	return;
 }
diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c
index fbb41717166..325ae548e7f 100644
--- a/sys/dev/usb/if_axen.c
+++ b/sys/dev/usb/if_axen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axen.c,v 1.23 2016/09/14 12:41:09 mpi Exp $	*/
+/*	$OpenBSD: if_axen.c,v 1.24 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
@@ -1086,7 +1086,6 @@ axen_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		axen_start(ifp);
 
-	ifp->if_opackets++;
 	splx(s);
 }
 
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 983ddae1d22..750382d650b 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.72 2016/10/12 21:51:11 fcambus Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.73 2017/01/22 10:17:39 dlg Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -814,8 +814,6 @@ cdce_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 
 	if (err)
 		ifp->if_oerrors++;
-	else
-		ifp->if_opackets++;
 
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		cdce_start(ifp);
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index c5c2df36e12..fb13562625e 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.76 2016/11/06 12:58:01 mpi Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.77 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -770,8 +770,6 @@ cue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->cue_mbuf);
 	c->cue_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 31f226043a4..4b8fad7c36c 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.85 2016/04/13 11:03:37 mpi Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.86 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -784,8 +784,6 @@ kue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->kue_mbuf);
 	c->kue_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index e8f12c5320a..761597dbd98 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mos.c,v 1.37 2016/11/06 12:58:01 mpi Exp $	*/
+/*	$OpenBSD: if_mos.c,v 1.38 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -1022,7 +1022,6 @@ mos_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		mos_start(ifp);
 
-	ifp->if_opackets++;
 	splx(s);
 	return;
 }
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 5b37a1ccb53..1025fa8c8b2 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.54 2016/11/06 12:58:01 mpi Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.55 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -1257,7 +1257,6 @@ otus_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
 	ifq_clr_oactive(&ifp->if_snd);
 	otus_start(ifp);
 	splx(s);
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index e6aebc9d627..add8e74454d 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.141 2016/11/06 12:58:01 mpi Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.142 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -681,7 +681,6 @@ ural_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	data->ni = NULL;
 
 	sc->tx_queued--;
-	ifp->if_opackets++;
 
 	DPRINTFN(10, ("tx done\n"));
 
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index 2ab10514708..b922d0c7580 100644
--- a/sys/dev/usb/if_rsu.c
+++ b/sys/dev/usb/if_rsu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.36 2016/07/26 18:18:04 stsp Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.37 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1453,7 +1453,6 @@ rsu_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
 
 	/* We just released a Tx buffer, notify Tx. */
 	if (ifq_is_oactive(&ifp->if_snd)) {
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 2940d4a803e..37bd8926324 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.119 2016/04/13 11:03:37 mpi Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.120 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -742,7 +742,6 @@ rum_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	data->ni = NULL;
 
 	sc->tx_queued--;
-	ifp->if_opackets++;
 
 	DPRINTFN(10, ("tx done\n"));
 
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 65e60b50577..4cbfa8a67ae 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.116 2016/04/13 11:03:37 mpi Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.117 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2374,7 +2374,6 @@ run_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	}
 
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
 	ifq_clr_oactive(&ifp->if_snd);
 	run_start(ifp);
 	splx(s);
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index 662d4ea8ac7..f3b89ebad91 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_smsc.c,v 1.28 2016/07/31 12:51:49 kettenis Exp $	*/
+/*	$OpenBSD: if_smsc.c,v 1.29 2017/01/22 10:17:39 dlg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
@@ -1262,7 +1262,6 @@ smsc_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		smsc_start(ifp);
 
-	ifp->if_opackets++;
 	splx(s);
 }
 
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 3d0d95465f3..1c3ba77970a 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.78 2016/11/06 12:58:01 mpi Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.79 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -1334,7 +1334,6 @@ uath_data_txeof(struct usbd_xfer *xfer, void *priv,
 	data->ni = NULL;
 
 	sc->tx_queued--;
-	ifp->if_opackets++;
 
 	sc->sc_tx_timer = 0;
 	ifq_clr_oactive(&ifp->if_snd);
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 8daa106fa87..b68cf5c1cab 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.78 2016/04/13 11:03:37 mpi Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.79 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -1025,8 +1025,6 @@ udav_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->udav_mbuf);
 	c->udav_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c
index 31523093598..2ebc4b634ab 100644
--- a/sys/dev/usb/if_ugl.c
+++ b/sys/dev/usb/if_ugl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ugl.c,v 1.20 2016/04/13 11:03:37 mpi Exp $	*/
+/*	$OpenBSD: if_ugl.c,v 1.21 2017/01/22 10:17:39 dlg Exp $	*/
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@@ -526,8 +526,6 @@ ugl_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->ugl_mbuf);
 	c->ugl_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index 0cdab04f921..4bed97d0ee1 100644
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_umb.c,v 1.8 2016/11/25 12:43:26 gerhard Exp $ */
+/*	$OpenBSD: if_umb.c,v 1.9 2017/01/22 10:17:39 dlg Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -1774,7 +1774,6 @@ umb_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 				usbd_clear_endpoint_stall_async(sc->sc_tx_pipe);
 		}
 	} else {
-		ifp->if_opackets++;
 		if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 			umb_start(ifp);
 	}
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index 61a699c36ef..19ba4ffc66a 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.78 2016/11/06 12:58:01 mpi Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.79 2017/01/22 10:17:39 dlg Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -1604,7 +1604,6 @@ upgt_tx_done(struct upgt_softc *sc, uint8_t *data)
 			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, ",
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index f9cf9d529af..1389222126e 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.72 2016/11/06 12:58:01 mpi Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.73 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -507,8 +507,6 @@ upl_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->upl_mbuf);
 	c->upl_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c
index e1d38a9e654..5e6ec3a659a 100644
--- a/sys/dev/usb/if_ure.c
+++ b/sys/dev/usb/if_ure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ure.c,v 1.2 2016/08/07 00:21:57 jmatthew Exp $	*/
+/*	$OpenBSD: if_ure.c,v 1.3 2017/01/22 10:17:39 dlg Exp $	*/
 /*-
  * Copyright (c) 2015 Kevin Lo <kevlo@FreeBSD.org>
  * All rights reserved.
@@ -1156,7 +1156,6 @@ ure_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		ure_start(ifp);
 
-	ifp->if_opackets++;
 	splx(s);
 	
 }
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 13478c8b544..1158788930e 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.81 2016/11/06 12:58:01 mpi Exp $ */
+/*	$OpenBSD: if_url.c,v 1.82 2017/01/22 10:17:39 dlg Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -885,8 +885,6 @@ url_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		return;
 	}
 
-	ifp->if_opackets++;
-
 	m_freem(c->url_mbuf);
 	c->url_mbuf = NULL;
 
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index 112556eceb0..7b584e88b00 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urndis.c,v 1.62 2016/09/16 11:13:37 mikeb Exp $ */
+/*	$OpenBSD: if_urndis.c,v 1.63 2017/01/22 10:17:39 dlg Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -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);
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index 432cd4d8a1e..4a983089f41 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.63 2017/01/09 14:44:28 mpi Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.64 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -2524,7 +2524,6 @@ urtw_txeof_low(struct usbd_xfer *xfer, void *priv,
 	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, void *priv,
 	data->ni = NULL;
 
 	sc->sc_txtimer = 0;
-	ifp->if_opackets++;
 
 	sc->sc_tx_normal_queued--;
 	ifq_clr_oactive(&ifp->if_snd);
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index d8f2430391d..22a537315e0 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.67 2017/01/08 05:48:27 stsp Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.68 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1237,7 +1237,6 @@ urtwn_txeof(struct usbd_xfer *xfer, void *priv,
 		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)) {
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 5bc9f6bbfda..8acf80fb066 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.115 2016/04/13 11:03:37 mpi Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.116 2017/01/22 10:17:39 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -2079,7 +2079,6 @@ zyd_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	data->ni = NULL;
 
 	sc->tx_queued--;
-	ifp->if_opackets++;
 
 	sc->tx_timer = 0;
 	ifq_clr_oactive(&ifp->if_snd);