aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith Manoharan <Sujith.Manoharan@atheros.com>2011-02-20 21:19:08 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-23 16:25:27 -0500
commit87df89579a4a3e6c767603acb762115159655745 (patch)
treeb8b8a1acc083db7cc727777e3536cc8a6f3c4cae /drivers
parent2299423bd0e32ccef78bbf1d4075617e3fd6cfd3 (diff)
ath9k_htc: Protect ampdu_action with a mutex
This is required when issuing commands to the firmware. Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 9620f4532f02..04cb243416ae 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1639,6 +1639,8 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
1639 struct ath9k_htc_sta *ista; 1639 struct ath9k_htc_sta *ista;
1640 int ret = 0; 1640 int ret = 0;
1641 1641
1642 mutex_lock(&priv->mutex);
1643
1642 switch (action) { 1644 switch (action) {
1643 case IEEE80211_AMPDU_RX_START: 1645 case IEEE80211_AMPDU_RX_START:
1644 break; 1646 break;
@@ -1663,6 +1665,8 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
1663 ath_err(ath9k_hw_common(priv->ah), "Unknown AMPDU action\n"); 1665 ath_err(ath9k_hw_common(priv->ah), "Unknown AMPDU action\n");
1664 } 1666 }
1665 1667
1668 mutex_unlock(&priv->mutex);
1669
1666 return ret; 1670 return ret;
1667} 1671}
1668 1672