commit f62167e88c0c1b9621f2984f1a59ae7d41cf4c88
author Naresh Jayaram <c_njayar@qti.qualcomm.com> Wed Nov 13 12:58:01 2013 -0800
committer Dmitry Shmidt <dimitrysh@google.com> Thu Nov 14 11:33:44 2013 -0800
tree 38200de8a35b10970f9cc65e9461035bb11e6b13
parent f708dcd0f0fabe4a22bed1d77e7002f58fb4bc69

TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)

Bug: 11631777

Change-Id: I3fbcf3cef4a6a4d894f78dd3dbe4757831e4fc56
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

wpa_supplicant/ctrl_iface.c

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index bafe1e9..6335605 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -568,6 +568,11 @@
 	wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_SETUP " MACSTR,
 		   MAC2STR(peer));
 
+	if ((wpa_s->conf->tdls_external_control) &&
+	     wpa_tdls_is_external_setup(wpa_s->wpa)) {
+		return wpa_drv_tdls_oper(wpa_s, TDLS_SETUP, peer);
+	}
+
 	wpa_tdls_remove(wpa_s->wpa, peer);
 
 	if (wpa_tdls_is_external_setup(wpa_s->wpa))
@@ -594,6 +599,11 @@
 	wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN " MACSTR,
 		   MAC2STR(peer));
 
+	if ((wpa_s->conf->tdls_external_control) &&
+	     wpa_tdls_is_external_setup(wpa_s->wpa)) {
+		return wpa_drv_tdls_oper(wpa_s, TDLS_TEARDOWN, peer);
+	}
+
 	if (wpa_tdls_is_external_setup(wpa_s->wpa))
 		ret = wpa_tdls_teardown_link(
 			wpa_s->wpa, peer,