cfg80211: clear SSID on disconnect/no connection

The SME state machine in cfg80211 uses the SSID stored
in struct wireless_dev internally, but fails to clear
it in multiple places (when giving up on a connection
attempt and when disconnecting). This doesn't matter to
the SME state machine, but does matter for IBSS. Thus,
in those cases, clear the SSID to avoid messing up the
IBSS state machine.

Reported-by: Joerg Albert <jal2@gmx.de>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index af91192eedf5b2fc5c1fb3083aaa3fbbacf733b8..8a7dcbf9060233bbf9bb7f5ef7a3a2af11caa8d3 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -385,6 +385,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                wdev->conn = NULL;
                kfree(wdev->connect_keys);
                wdev->connect_keys = NULL;
+               wdev->ssid_len = 0;
                return;
        }
 
@@ -566,6 +567,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
 
        wdev->current_bss = NULL;
        wdev->sme_state = CFG80211_SME_IDLE;
+       wdev->ssid_len = 0;
 
        if (wdev->conn) {
                kfree(wdev->conn->ie);
@@ -721,6 +723,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
                        wdev->conn = NULL;
                        wdev->sme_state = CFG80211_SME_IDLE;
                        wdev->connect_keys = NULL;
+                       wdev->ssid_len = 0;
                }
 
                return err;
@@ -785,6 +788,7 @@ int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,
                        wdev->sme_state = CFG80211_SME_IDLE;
                        kfree(wdev->conn);
                        wdev->conn = NULL;
+                       wdev->ssid_len = 0;
                        return 0;
                }