From bcd1118c04733fc31492fa5b10e3040d3e9d5cad Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 11 Jul 2009 00:17:32 +0200 Subject: [PATCH] --- yaml --- r: 159093 b: refs/heads/master c: 596a07c18b35c9df2fb212856241ae0dfe3162b9 h: refs/heads/master i: 159091: bf0dc738c1657c414a6accc25eda9ff36c214f76 v: v3 --- [refs] | 2 +- trunk/net/wireless/mlme.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7a4572b82206..c76d0100b59b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 930c06f27120fa8cf0bfb6fa000a701cfaf01ed6 +refs/heads/master: 596a07c18b35c9df2fb212856241ae0dfe3162b9 diff --git a/trunk/net/wireless/mlme.c b/trunk/net/wireless/mlme.c index 8e4ce2fdf862..5b9b22120824 100644 --- a/trunk/net/wireless/mlme.c +++ b/trunk/net/wireless/mlme.c @@ -178,12 +178,12 @@ static void __cfg80211_send_disassoc(struct net_device *dev, bool from_ap; bool done = false; - wdev_lock(wdev); + ASSERT_WDEV_LOCK(wdev); nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL); - if (!wdev->sme_state == CFG80211_SME_CONNECTED) - goto out; + if (wdev->sme_state != CFG80211_SME_CONNECTED) + return; if (wdev->current_bss && 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; __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,