Skip to content

Commit

Permalink
ath5k: fix recursive locking in ath5k_beacon_update
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bob Copeland authored and John W. Linville committed Jul 29, 2008
1 parent cb9289c commit bc05116
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/net/wireless/ath5k/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -3065,8 +3065,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)

ath5k_debug_dump_skb(sc, skb, "BC ", 1);

mutex_lock(&sc->lock);

if (sc->opmode != IEEE80211_IF_TYPE_IBSS) {
ret = -EIO;
goto end;
Expand All @@ -3083,7 +3081,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
}

end:
mutex_unlock(&sc->lock);
return ret;
}

0 comments on commit bc05116

Please sign in to comment.