cfg80211: use reassociation when possible

With the move of everything related to the SME from
mac80211 to cfg80211, we lost the ability to send
reassociation frames. This adds them back, but only
for wireless extensions. With the userspace SME, it
shall control assoc vs. reassoc (it already can do
so with the nl80211 interface).

I haven't touched the connect() implementation, so
it is not possible to reassociate with the nl80211
connect primitive. I think that should be done with
the NL80211_CMD_ROAM command, but we'll have to see
how that can be handled in the future, especially
with fullmac chips.

This patch addresses only the immediate regression
we had in mac80211, which previously sent reassoc.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index fe1a53639122..907470063f22 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -15,6 +15,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                               struct wireless_dev *wdev)
 {
         struct cfg80211_cached_keys *ck = NULL;
+        const u8 *prev_bssid = NULL;
         int err, i;
 
         ASSERT_RDEV_LOCK(rdev);
@@ -42,8 +43,12 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                 for (i = 0; i < 6; i++)
                         ck->params[i].key = ck->data[i];
         }
+
+        if (wdev->wext.prev_bssid_valid)
+                prev_bssid = wdev->wext.prev_bssid;
+
         err = __cfg80211_connect(rdev, wdev->netdev,
-                                 &wdev->wext.connect, ck);
+                                 &wdev->wext.connect, ck, prev_bssid);
         if (err)
                 kfree(ck);
 
@@ -184,6 +189,7 @@ int cfg80211_mgd_wext_siwessid(struct net_device *dev,
                         goto out;
         }
 
+        wdev->wext.prev_bssid_valid = false;
         wdev->wext.connect.ssid = wdev->wext.ssid;
         memcpy(wdev->wext.ssid, ssid, len);
         wdev->wext.connect.ssid_len = len;