diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-05-08 05:03:32 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-22 15:05:33 -0400 |
| commit | 7ca7c776dbc50cf1394dd95e971e7997a4ec025e (patch) | |
| tree | a209cc44b7c781b381269d8b26bde39dd3cee118 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 73900cb068a2948d636feae0c8bc25cc2d568d6d (diff) | |
| download | lwn-7ca7c776dbc50cf1394dd95e971e7997a4ec025e.tar.gz lwn-7ca7c776dbc50cf1394dd95e971e7997a4ec025e.zip | |
ath9k: Do not use local_bh_disable in ampdu_action
This was added during the early conversion of ampdu_action
to a sleeping callback. There is no need to do this - instead,
use the normal mutex that is acquired for all callbacks.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index ec6524aa5178..e6a30958e944 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1684,7 +1684,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, struct ath_softc *sc = hw->priv; int ret = 0; - local_bh_disable(); + mutex_lock(&sc->mutex); switch (action) { case IEEE80211_AMPDU_RX_START: @@ -1715,7 +1715,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, ath_err(ath9k_hw_common(sc->sc_ah), "Unknown AMPDU action\n"); } - local_bh_enable(); + mutex_unlock(&sc->mutex); return ret; } |