summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_wb.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/if_wb.c')
-rw-r--r--sys/dev/pci/if_wb.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 8cf4c154d8f..ea52e9a4bf9 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.65 2015/11/24 17:11:39 mpi Exp $ */
+/* $OpenBSD: if_wb.c,v 1.66 2015/11/25 03:09:59 dlg Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1065,7 +1065,7 @@ void wb_txeoc(sc)
ifp->if_timer = 0;
if (sc->wb_cdata.wb_tx_head == NULL) {
- ifp->if_flags &= ~IFF_OACTIVE;
+ ifq_clr_oactive(&ifp->if_snd);
sc->wb_cdata.wb_tx_tail = NULL;
} else {
if (WB_TXOWN(sc->wb_cdata.wb_tx_head) == WB_UNSENT) {
@@ -1285,7 +1285,7 @@ void wb_start(ifp)
* punt.
*/
if (sc->wb_cdata.wb_tx_free->wb_mbuf != NULL) {
- ifp->if_flags |= IFF_OACTIVE;
+ ifq_set_oactive(&ifp->if_snd);
return;
}
@@ -1468,7 +1468,7 @@ void wb_init(xsc)
WB_SETBIT(sc, WB_NETCFG, WB_NETCFG_TX_ON);
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
+ ifq_clr_oactive(&ifp->if_snd);
splx(s);
@@ -1593,7 +1593,8 @@ void wb_stop(sc)
timeout_del(&sc->wb_tick_tmo);
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
+ ifq_clr_oactive(&ifp->if_snd);
WB_CLRBIT(sc, WB_NETCFG, (WB_NETCFG_RX_ON|WB_NETCFG_TX_ON));
CSR_WRITE_4(sc, WB_IMR, 0x00000000);