AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cfg80211: fix more bugs in mlme handling

Browse Source 
The "what-was-I-thinking-if-anything" patch. Clearly,
if cfg80211_send_disassoc() does wdev_lock() and then
calls __cfg80211_send_disassoc(), the latter shouldn't
lock again. And the sme_state test is ... no further
comments.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-07-11 00:17:32 +02:00 committed by John W. Linville
parent 930c06f271
commit 596a07c18b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/wireless/mlme.c
View File

@ -178,12 +178,12 @@ static void __cfg80211_send_disassoc(struct net_device *dev,
bool from_ap; bool from_ap;
bool done = false; bool done = false;
wdev_lock(wdev); ASSERT_WDEV_LOCK(wdev);
nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL); nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL);
if (!wdev->sme_state == CFG80211_SME_CONNECTED) if (wdev->sme_state != CFG80211_SME_CONNECTED)
goto out; return;
if (wdev->current_bss && if (wdev->current_bss &&
memcmp(wdev->current_bss, bssid, ETH_ALEN) == 0) { memcmp(wdev->current_bss, bssid, ETH_ALEN) == 0) {
@ -205,8 +205,6 @@ static void __cfg80211_send_disassoc(struct net_device *dev,
from_ap = memcmp(mgmt->da, dev->dev_addr, ETH_ALEN) == 0; from_ap = memcmp(mgmt->da, dev->dev_addr, ETH_ALEN) == 0;
__cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap); __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
out:
wdev_unlock(wdev);
} }
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len, void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len,