mac80211: Fix reassociation by not clearing previous BSSID

[deliverable/linux.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 4c753bb43ba9a41ff8eeb6c2daacd18c73a0eb83..1f49b63d8dd268c5e8dc32b035a30ae05876151a 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1888,8 +1888,6 @@ int ieee80211_sta_commit(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
-       ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
-
        if (ifmgd->ssid_len)
                ifmgd->flags |= IEEE80211_STA_SSID_SET;
        else
@@ -1908,6 +1906,10 @@ int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size
        ifmgd = &sdata->u.mgd;
 
        if (ifmgd->ssid_len != len || memcmp(ifmgd->ssid, ssid, len) != 0) {
+               /*
+                * Do not use reassociation if SSID is changed (different ESS).
+                */
+               ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
                memset(ifmgd->ssid, 0, sizeof(ifmgd->ssid));
                memcpy(ifmgd->ssid, ssid, len);
                ifmgd->ssid_len = len;