diff options
| author | Pavel Roskin <proski@gnu.org> | 2011-07-07 18:14:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:47:14 -0400 |
| commit | 4fc5401c144d95b031e839ba3208e04c79ac84cb (patch) | |
| tree | 51c8c54548969014937fd0714831bf4e7241e007 /drivers/net/wireless/ath/ath5k | |
| parent | e2df64c1d767eb52a5c617668e20745d5e3015c8 (diff) | |
| download | blackbird-op-linux-4fc5401c144d95b031e839ba3208e04c79ac84cb.tar.gz blackbird-op-linux-4fc5401c144d95b031e839ba3208e04c79ac84cb.zip | |
ath5k: read sc->imask with sc->irqlock held
Signed-off-by: Pavel Roskin <proski@gnu.org>
sc->imask may change if ath5k_set_current_imask() races against itself.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 58997d3abae6..28113e023c62 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -1447,10 +1447,11 @@ ath5k_receive_frame_ok(struct ath5k_softc *sc, struct ath5k_rx_status *rs) static void ath5k_set_current_imask(struct ath5k_softc *sc) { - enum ath5k_int imask = sc->imask; + enum ath5k_int imask; unsigned long flags; spin_lock_irqsave(&sc->irqlock, flags); + imask = sc->imask; if (sc->rx_pending) imask &= ~AR5K_INT_RX_ALL; if (sc->tx_pending) |
