diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-10-15 20:25:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-10-15 20:25:17 -0700 |
| commit | 2047fa5ecf7afce98b8f8630a075f4c2b39e8a13 (patch) | |
| tree | 8ee3b5b241e7053097a9559c589167465901d475 | |
| parent | 2d7e2ae8a440f2e03b14be752c453a0f15e2f078 (diff) | |
| parent | be7086c41a38c3728724f52a3b2dc96505f5b4a2 (diff) | |
| download | android_external_wpa_supplicant_8-2047fa5ecf7afce98b8f8630a075f4c2b39e8a13.tar.gz android_external_wpa_supplicant_8-2047fa5ecf7afce98b8f8630a075f4c2b39e8a13.tar.bz2 android_external_wpa_supplicant_8-2047fa5ecf7afce98b8f8630a075f4c2b39e8a13.zip | |
Merge "TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external"
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 4089fb94..369a39ed 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -572,6 +572,7 @@ static int wpa_supplicant_ctrl_iface_tdls_teardown( struct wpa_supplicant *wpa_s, char *addr) { u8 peer[ETH_ALEN]; + int ret; if (hwaddr_aton(addr, peer)) { wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN: invalid " @@ -582,8 +583,14 @@ static int wpa_supplicant_ctrl_iface_tdls_teardown( wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN " MACSTR, MAC2STR(peer)); - return wpa_tdls_teardown_link(wpa_s->wpa, peer, - WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED); + if (wpa_tdls_is_external_setup(wpa_s->wpa)) + ret = wpa_tdls_teardown_link( + wpa_s->wpa, peer, + WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED); + else + ret = wpa_drv_tdls_oper(wpa_s, TDLS_TEARDOWN, peer); + + return ret; } #endif /* CONFIG_TDLS */ |