Commit b6f0b639 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

cfg80211: fix SME association after disassociation

When an AP disassociates us, we currently go into a weird
state because the SME doesn't handle authenticated but not
associated well unless it's within its own state machine,
it can't recover from that. However, it shouldn't need to,
since we don't do any decisions in it really -- so when we
get disconnected, simply deauthenticate too.
Reported-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e458b8a2
...@@ -570,10 +570,30 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie, ...@@ -570,10 +570,30 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
wdev->ssid_len = 0; wdev->ssid_len = 0;
if (wdev->conn) { if (wdev->conn) {
const u8 *bssid;
int ret;
kfree(wdev->conn->ie); kfree(wdev->conn->ie);
wdev->conn->ie = NULL; wdev->conn->ie = NULL;
kfree(wdev->conn); kfree(wdev->conn);
wdev->conn = NULL; wdev->conn = NULL;
/*
* If this disconnect was due to a disassoc, we
* we might still have an auth BSS around. For
* the userspace SME that's currently expected,
* but for the kernel SME (nl80211 CONNECT or
* wireless extensions) we want to clear up all
* state.
*/
for (i = 0; i < MAX_AUTH_BSSES; i++) {
if (!wdev->auth_bsses[i])
continue;
bssid = wdev->auth_bsses[i]->pub.bssid;
ret = __cfg80211_mlme_deauth(rdev, dev, bssid, NULL, 0,
WLAN_REASON_DEAUTH_LEAVING);
WARN(ret, "deauth failed: %d\n", ret);
}
} }
nl80211_send_disconnected(rdev, dev, reason, ie, ie_len, from_ap); nl80211_send_disconnected(rdev, dev, reason, ie, ie_len, from_ap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment