cfg80211: fix two buglets
This fixes two small bugs: 1) the connect variable is already initialised, and the assignment to auth_type overwrites the previous setting with a wrong value 2) when all authentication attempts fail, we need to report that we couldn't connect Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
a71d62dbf3
Коммит
4bde0f7d1d
|
@ -3680,10 +3680,6 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
|
|||
|
||||
wiphy = &rdev->wiphy;
|
||||
|
||||
connect.bssid = NULL;
|
||||
connect.channel = NULL;
|
||||
connect.auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
|
||||
|
||||
if (info->attrs[NL80211_ATTR_MAC])
|
||||
connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
|
||||
connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
|
||||
|
|
|
@ -295,9 +295,8 @@ void cfg80211_sme_rx_auth(struct net_device *dev,
|
|||
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
|
||||
schedule_work(&rdev->conn_work);
|
||||
} else if (status_code != WLAN_STATUS_SUCCESS) {
|
||||
wdev->sme_state = CFG80211_SME_IDLE;
|
||||
kfree(wdev->conn);
|
||||
wdev->conn = NULL;
|
||||
__cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
|
||||
status_code, false);
|
||||
} else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
|
||||
wdev->conn->state == CFG80211_CONN_AUTHENTICATING) {
|
||||
wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;
|
||||
|
|
Загрузка…
Ссылка в новой задаче