summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@openbsd.org>2010-12-31 21:44:38 +0000
committerdamien <damien@openbsd.org>2010-12-31 21:44:38 +0000
commit13a6db0deadefdc21ac6af004c175325b59cb8b1 (patch)
tree18f04064185bcc1a89dcc58b090f0dba7e4b2fcb
parentMassive overhauling of the m88k pmap, though I can't pretend it's a new pmap (diff)
downloadwireguard-openbsd-13a6db0deadefdc21ac6af004c175325b59cb8b1.tar.xz
wireguard-openbsd-13a6db0deadefdc21ac6af004c175325b59cb8b1.zip
when stopping Rx, set the AR_DIAG_RX_ABORT bit too.
-rw-r--r--sys/dev/ic/athn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 67bc0fb1fed..64cc4263f71 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: athn.c,v 1.67 2010/12/31 18:24:41 damien Exp $ */
+/* $OpenBSD: athn.c,v 1.68 2010/12/31 21:44:38 damien Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -861,7 +861,7 @@ athn_switch_chan(struct athn_softc *sc, struct ieee80211_channel *c,
athn_tx_reclaim(sc, qid);
/* Stop Rx. */
- AR_SETBITS(sc, AR_DIAG_SW, AR_DIAG_RX_DIS);
+ AR_SETBITS(sc, AR_DIAG_SW, AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT);
AR_WRITE(sc, AR_MIBC, AR_MIBC_FMC);
AR_WRITE(sc, AR_MIBC, AR_MIBC_CMC);
AR_WRITE(sc, AR_FILT_OFDM, 0);
@@ -2781,7 +2781,7 @@ athn_stop(struct ifnet *ifp, int disable)
athn_tx_reclaim(sc, qid);
/* Stop Rx. */
- AR_SETBITS(sc, AR_DIAG_SW, AR_DIAG_RX_DIS);
+ AR_SETBITS(sc, AR_DIAG_SW, AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT);
AR_WRITE(sc, AR_MIBC, AR_MIBC_FMC);
AR_WRITE(sc, AR_MIBC, AR_MIBC_CMC);
AR_WRITE(sc, AR_FILT_OFDM, 0);