diff options
author | Bob Copeland <me@bobcopeland.com> | 2008-07-18 11:11:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-29 16:55:04 -0400 |
commit | bc05116ab33d30342e2b4b1bcc6d6e1184e9df97 (patch) | |
tree | 0ae891913378b746d6285bcd6246baa9ceb30f4d /drivers/net | |
parent | cb9289cb798502a5010c8f1d8d003842cd1449a4 (diff) |
ath5k: fix recursive locking in ath5k_beacon_update
ath5k_beacon_update takes sc->lock upon entry. However, it is only
called from within ath5k_config_interface, which already holds the lock.
Remove the unnecessary locking from ath5k_beacon_update.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 359795d8b482..3285032727b3 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -3065,8 +3065,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
3065 | 3065 | ||
3066 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); | 3066 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); |
3067 | 3067 | ||
3068 | mutex_lock(&sc->lock); | ||
3069 | |||
3070 | if (sc->opmode != IEEE80211_IF_TYPE_IBSS) { | 3068 | if (sc->opmode != IEEE80211_IF_TYPE_IBSS) { |
3071 | ret = -EIO; | 3069 | ret = -EIO; |
3072 | goto end; | 3070 | goto end; |
@@ -3083,7 +3081,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
3083 | } | 3081 | } |
3084 | 3082 | ||
3085 | end: | 3083 | end: |
3086 | mutex_unlock(&sc->lock); | ||
3087 | return ret; | 3084 | return ret; |
3088 | } | 3085 | } |
3089 | 3086 | ||