Skip to content

Commit

Permalink
cfg80211: fix a locking bug
Browse files Browse the repository at this point in the history
The cfg80211_sme_disassoc() function is already holding
a lock here that cfg80211_mlme_deauth() would take, so
it needs to use __cfg80211_mlme_deauth() instead.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jul 24, 2009
1 parent b291ba1 commit ec3f149
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/wireless/sme.c
Original file line number Diff line number Diff line change
Expand Up @@ -826,8 +826,8 @@ void cfg80211_sme_disassoc(struct net_device *dev, int idx)
return;

memcpy(bssid, wdev->auth_bsses[idx]->pub.bssid, ETH_ALEN);
if (cfg80211_mlme_deauth(rdev, dev, bssid,
NULL, 0, WLAN_REASON_DEAUTH_LEAVING)) {
if (__cfg80211_mlme_deauth(rdev, dev, bssid,
NULL, 0, WLAN_REASON_DEAUTH_LEAVING)) {
/* whatever -- assume gone anyway */
cfg80211_unhold_bss(wdev->auth_bsses[idx]);
cfg80211_put_bss(&wdev->auth_bsses[idx]->pub);
Expand Down

0 comments on commit ec3f149

Please sign in to comment.