diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-01 08:31:15 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-01 08:31:15 -0800 |
| commit | a0ef4993777b07e0ced5b1d7d2c056dcf61a0d17 (patch) | |
| tree | 8384c03b9001081ebc421a1f8a4a5adc0be60dde /src/rsn_supp | |
| parent | 30a76b3f403acd0a0d2451bc6f8f61863078ff1d (diff) | |
| parent | 5556b4903366e6ffacd0d99e855d15df95108596 (diff) | |
| download | android_external_wpa_supplicant_8-a0ef4993777b07e0ced5b1d7d2c056dcf61a0d17.tar.gz android_external_wpa_supplicant_8-a0ef4993777b07e0ced5b1d7d2c056dcf61a0d17.tar.bz2 android_external_wpa_supplicant_8-a0ef4993777b07e0ced5b1d7d2c056dcf61a0d17.zip | |
Merge "TDLS: Do not send error case of TPK M3 if TX fails"
Diffstat (limited to 'src/rsn_supp')
| -rw-r--r-- | src/rsn_supp/tdls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c index 2bbcab16..0ac04227 100644 --- a/src/rsn_supp/tdls.c +++ b/src/rsn_supp/tdls.c @@ -2391,7 +2391,7 @@ skip_rsn: wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Setup Confirm / " "TPK Handshake Message 3"); if (wpa_tdls_send_tpk_m3(sm, src_addr, dtoken, lnkid, peer) < 0) - goto error; + goto error_no_msg; if (!peer->tpk_success) { /* @@ -2412,6 +2412,7 @@ skip_rsn: error: wpa_tdls_send_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM, dtoken, 1, status); +error_no_msg: wpa_tdls_disable_peer_link(sm, peer); return -1; } |