diff options
| author | Sunil Dutt <c_duttus@qti.qualcomm.com> | 2013-09-30 17:36:26 +0300 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-09-30 13:26:54 -0700 |
| commit | 8b43e82b5aa16d167d3e2696b7827c412b0e0a00 (patch) | |
| tree | 59124a9d66c0f91a4aad44e0ec12d83d723e4d14 | |
| parent | d0ef38b52c069e34102b38dafbbc1fe055364ae8 (diff) | |
| download | wpa_supplicant_8-8b43e82b5aa16d167d3e2696b7827c412b0e0a00.tar.gz | |
TDLS: Use wpa_tdls_disable_peer_link() in TPK M1 processing
This function is used only with external setup, so this can cleaned up
to use simpler design.
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| -rw-r--r-- | src/rsn_supp/tdls.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c index 2218b466..41ab3fcc 100644 --- a/src/rsn_supp/tdls.c +++ b/src/rsn_supp/tdls.c @@ -1479,19 +1479,7 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, wpa_printf(MSG_DEBUG, "TDLS: TDLS Setup Request while " "direct link is enabled - tear down the " "old link first"); -#if 0 - /* TODO: Disabling the link would be more proper - * operation here, but it seems to trigger a race with - * some drivers handling the new request frame. */ - wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr); -#else - if (sm->tdls_external_setup) - wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, - src_addr); - else - wpa_tdls_del_key(sm, peer); -#endif - wpa_tdls_peer_free(sm, peer); + wpa_tdls_disable_peer_link(sm, peer); } /* @@ -1512,12 +1500,7 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, MACSTR " (terminate previously " "initiated negotiation", MAC2STR(src_addr)); - if (sm->tdls_external_setup) - wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, - src_addr); - else - wpa_tdls_del_key(sm, peer); - wpa_tdls_peer_free(sm, peer); + wpa_tdls_disable_peer_link(sm, peer); } } } |