From: Jouni Malinen <j@w1.fi>
Date: Sat, 17 Dec 2011 16:07:58 +0000 (+0200)
Subject: Fix CONFIG_NO_SCAN_PROCESSING=y build with ctrl_iface
X-Git-Tag: aosp-jb-start~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90b8fc8f4eeb8f8aa90efb6d76361f55e66d67c2;p=thirdparty%2Fhostap.git

Fix CONFIG_NO_SCAN_PROCESSING=y build with ctrl_iface

Need to remove ROAM command processing since the needed functionality
for it gets removed with CONFIG_NO_SCAN_PROCESSING=y.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index b07c04a02..ebf9bbb6c 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2405,6 +2405,9 @@ static void wpa_supplicant_ctrl_iface_drop_sa(struct wpa_supplicant *wpa_s)
 static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s,
 					  char *addr)
 {
+#ifdef CONFIG_NO_SCAN_PROCESSING
+	return -1;
+#else /* CONFIG_NO_SCAN_PROCESSING */
 	u8 bssid[ETH_ALEN];
 	struct wpa_bss *bss;
 	struct wpa_ssid *ssid = wpa_s->current_ssid;
@@ -2439,6 +2442,7 @@ static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s,
 	wpa_supplicant_connect(wpa_s, bss, ssid);
 
 	return 0;
+#endif /* CONFIG_NO_SCAN_PROCESSING */
 }