diff options
| author | Sunil Dutt <c_duttus@qti.qualcomm.com> | 2013-10-03 18:44:54 +0530 |
|---|---|---|
| committer | Sunil Dutt <duttus@codeaurora.org> | 2013-10-03 19:18:15 +0530 |
| commit | 013eae64696b06a7794e2e131d05ade8abd26e5e (patch) | |
| tree | 15accc566ab2028e43d6eec7af3eed55e7db1674 | |
| parent | ae54b0da2630959d635fdadbdc74e9e71e027fb3 (diff) | |
| download | android_external_wpa_supplicant_8-013eae64696b06a7794e2e131d05ade8abd26e5e.tar.gz android_external_wpa_supplicant_8-013eae64696b06a7794e2e131d05ade8abd26e5e.tar.bz2 android_external_wpa_supplicant_8-013eae64696b06a7794e2e131d05ade8abd26e5e.zip | |
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>
Git-commit: 33d85b63b59fcb1c460ede64ececb45c9ea2cabc
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: If0b254b0ff571ca584fc15b2d0a9cddf4004009f
CRs-fixed: 552276
| -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 e5bb8b95..85fdd8d5 100644 --- a/src/rsn_supp/tdls.c +++ b/src/rsn_supp/tdls.c @@ -1482,19 +1482,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); } /* @@ -1515,12 +1503,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); } } } |