diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2015-03-15 20:42:41 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2015-03-15 20:42:41 +0000 |
| commit | 10550f6135970b784f289409418443ac0301efd5 (patch) | |
| tree | 0dfcdb48c649b7303d6f8e2f5912fb8e514d110d /sys | |
| parent | 0b093122eb4b27803df9abd1fba6355ad47afe7a (diff) | |
| download | src-10550f6135970b784f289409418443ac0301efd5.tar.gz src-10550f6135970b784f289409418443ac0301efd5.zip | |
Move some code under WPI_LOCK().
PR: kern/197143
Submitted by: Andriy Voskoboinyk <s3erios@gmail.com>
Notes
Notes:
svn path=/head/; revision=280074
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/wpi/if_wpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 914b2655e1af..ab656aaf1db8 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2408,6 +2408,9 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf) if (++ring->queued > WPI_TX_RING_HIMARK) sc->qfullmsk |= 1 << ring->qid; + if (ring->qid < WPI_CMD_QUEUE_NUM) + sc->sc_tx_timer = 5; + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); WPI_TXQ_UNLOCK(sc); @@ -2722,8 +2725,6 @@ wpi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, return error; } - sc->sc_tx_timer = 5; - DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); return 0; @@ -2771,8 +2772,7 @@ wpi_start_locked(struct ifnet *ifp) ieee80211_free_node(ni); WPI_LOCK(sc); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - } else - sc->sc_tx_timer = 5; + } } DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__); @@ -3195,9 +3195,9 @@ wpi_update_promisc(struct ifnet *ifp) { struct wpi_softc *sc = ifp->if_softc; + WPI_LOCK(sc); wpi_set_promisc(sc); - WPI_LOCK(sc); if (wpi_send_rxon(sc, 1, 1) != 0) { device_printf(sc->sc_dev, "%s: could not send RXON\n", __func__); |