TDLS: Do not clear peer data too early for teardown

TPK will be needed to be able to generate FTIE MIC for the
teardown message, so maintain peer data for a bit longer in
case the teardown FTIE request comes back from the driver.

diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index f27f6af41de5807acd075af47b328e48c42f5e4e..27090e308403c8e18b8ad042bff52171a614028f 100644 (file)
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -263,7 +263,7 @@ static int wpa_tdls_tpk_send(struct wpa_sm *sm, const u8 *dest, u8 action_code,
 
 
 static int wpa_tdls_do_teardown(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
-                               u16 reason_code)
+                               u16 reason_code, int free_peer)
 {
        int ret;
 
@@ -276,7 +276,8 @@ static int wpa_tdls_do_teardown(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
                ret = wpa_sm_tdls_oper(sm, TDLS_TEARDOWN, peer->addr);
        }
 
-       wpa_tdls_peer_free(sm, peer);
+       if (sm->tdls_external_setup || free_peer)
+               wpa_tdls_peer_free(sm, peer);
 
        return ret;
 }
@@ -324,7 +325,7 @@ static void wpa_tdls_tpk_retry_timeout(void *eloop_ctx, void *timeout_ctx)
 
                wpa_printf(MSG_DEBUG, "TDLS: Sending Teardown Request");
                wpa_tdls_do_teardown(sm, peer,
-                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
+                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED, 1);
        }
 }
 
@@ -602,7 +603,7 @@ static void wpa_tdls_tpk_timeout(void *eloop_ctx, void *timeout_ctx)
                wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime expired for " MACSTR
                           " - tear down", MAC2STR(peer->addr));
                wpa_tdls_do_teardown(sm, peer,
-                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
+                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED, 1);
        }
 }
 
@@ -755,7 +756,7 @@ int wpa_tdls_teardown_link(struct wpa_sm *sm, const u8 *addr, u16 reason_code)
                return -1;
        }
 
-       return wpa_tdls_do_teardown(sm, peer, reason_code);
+       return wpa_tdls_do_teardown(sm, peer, reason_code, 0);
 }