From: Jouni Malinen <j@w1.fi>
Date: Sat, 13 Mar 2010 16:26:25 +0000 (+0200)
Subject: FT: Update SME frequency info before sme_associate() call
X-Git-Tag: hostap_0_7_2~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe1919856c3e564748c4601f27b0953d897beaee;p=thirdparty%2Fhostap.git

FT: Update SME frequency info before sme_associate() call

This is needed to allow FT-over-DS to request correct channel for
the reassociation with the target AP.
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index cfe6dc33c..8e0424841 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1545,7 +1545,16 @@ static void ft_rx_action(struct wpa_supplicant *wpa_s, const u8 *data,
 				    target_ap_addr, NULL, 0) < 0)
 		return;
 
-	sme_associate(wpa_s, WPAS_MODE_INFRA, target_ap_addr, WLAN_AUTH_FT);
+#ifdef CONFIG_SME
+	{
+		struct wpa_bss *bss;
+		bss = wpa_bss_get_bssid(wpa_s, target_ap_addr);
+		if (bss)
+			wpa_s->sme.freq = bss->freq;
+		sme_associate(wpa_s, WPAS_MODE_INFRA, target_ap_addr,
+			      WLAN_AUTH_FT);
+	}
+#endif /* CONFIG_SME */
 }
 #endif /* CONFIG_IEEE80211R */