aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/wireless/nl80211.c4
-rw-r--r--net/wireless/sme.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4478760b7dc3..a00fd644370b 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3680,10 +3680,6 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
3680 3680
3681 wiphy = &rdev->wiphy; 3681 wiphy = &rdev->wiphy;
3682 3682
3683 connect.bssid = NULL;
3684 connect.channel = NULL;
3685 connect.auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
3686
3687 if (info->attrs[NL80211_ATTR_MAC]) 3683 if (info->attrs[NL80211_ATTR_MAC])
3688 connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]); 3684 connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
3689 connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]); 3685 connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index df9173f73604..79ca56cbfd36 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -295,9 +295,8 @@ void cfg80211_sme_rx_auth(struct net_device *dev,
295 wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; 295 wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
296 schedule_work(&rdev->conn_work); 296 schedule_work(&rdev->conn_work);
297 } else if (status_code != WLAN_STATUS_SUCCESS) { 297 } else if (status_code != WLAN_STATUS_SUCCESS) {
298 wdev->sme_state = CFG80211_SME_IDLE; 298 __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
299 kfree(wdev->conn); 299 status_code, false);
300 wdev->conn = NULL;
301 } else if (wdev->sme_state == CFG80211_SME_CONNECTING && 300 } else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
302 wdev->conn->state == CFG80211_CONN_AUTHENTICATING) { 301 wdev->conn->state == CFG80211_CONN_AUTHENTICATING) {
303 wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT; 302 wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;