From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 19 Sep 2008 03:10:34 +0000 (+0200)
Subject: mac80211: probe with correct SSID
X-Git-Tag: v2.6.28-rc1~717^2~172^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4dfe51e10047a60e82734860cec0d9f660b102fc;p=linux-2.6-omap-h63xx.git

mac80211: probe with correct SSID

While associated, we should probe with the SSID we're associated to,
not the scan SSID.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 109c3a7e63a..52a64813301 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -942,8 +942,8 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 				disassoc = 1;
 			} else
 				ieee80211_send_probe_req(sdata, ifsta->bssid,
-							 local->scan_ssid,
-							 local->scan_ssid_len);
+							 ifsta->ssid,
+							 ifsta->ssid_len);
 			ifsta->flags ^= IEEE80211_STA_PROBEREQ_POLL;
 		} else {
 			ifsta->flags &= ~IEEE80211_STA_PROBEREQ_POLL;