2009-03-03 04:50:55

by Sujith

[permalink] [raw]
Subject: [PATCH 6/7] ath9k: Lock config_interface() callback with a mutex

Signed-off-by: Sujith <[email protected]>
---
drivers/net/wireless/ath9k/main.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index ee72a0c..4f68e30 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -2316,6 +2316,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
u32 rfilt = 0;
int error, i;

+ mutex_lock(&sc->mutex);
+
/* TODO: Need to decide which hw opmode to use for multi-interface
* cases */
if (vif->type == NL80211_IFTYPE_AP &&
@@ -2371,8 +2373,10 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);

error = ath_beacon_alloc(sc, 0);
- if (error != 0)
+ if (error != 0) {
+ mutex_unlock(&sc->mutex);
return error;
+ }

ath_beacon_config(sc, 0);
}
@@ -2391,6 +2395,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
if (vif->type == NL80211_IFTYPE_ADHOC)
ath_update_chainmask(sc, 0);

+ mutex_unlock(&sc->mutex);
+
return 0;
}

--
1.6.1