]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external
authorArend van Spriel <arend@broadcom.com>
Sat, 20 Jul 2013 14:52:32 +0000 (17:52 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 20 Jul 2013 14:52:32 +0000 (17:52 +0300)
When the device indicates to take care of TDLS operations the TDLS
setup is done calling wpas_drv_tdls_oper(). This patch does a similar
thing for the teardown. This fixes failure of teardown:

"TDLS: Could not find peer <mac> for link Teardown"

Signed-hostap: Arend van Spriel <arend@broadcom.com>

wpa_supplicant/ctrl_iface.c

index a9c771546e22373c9bde56da282100c80ce95911..81ca37d759016c4a46572fbdd9af2ae0e394abb8 100644 (file)
@@ -577,6 +577,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 "
@@ -587,8 +588,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 */