From 41bff862d9e8d880b09590d298de377f52f0e444 Mon Sep 17 00:00:00 2001 From: Bob Copeland Date: Tue, 27 Jan 2015 08:17:58 -0500 Subject: [PATCH] mesh: Always free the station if peering failed Previously, we would only free the station entry if a peering close frame was received (freeing the station entry causes the kernel to start sending peer candidate events again when suitable beacons are received, triggering peering or authentication to restart). The end result is the same in any case regardless of close reason: if we leave holding state then peering has started again, so go ahead and remove the station in all cases. Signed-off-by: Bob Copeland --- wpa_supplicant/mesh_mpm.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c index 0da7e1373..bc61da96e 100644 --- a/wpa_supplicant/mesh_mpm.c +++ b/wpa_supplicant/mesh_mpm.c @@ -384,14 +384,7 @@ static void mesh_mpm_fsm_restart(struct wpa_supplicant *wpa_s, eloop_cancel_timeout(plink_timer, wpa_s, sta); - if (sta->mpm_close_reason == WLAN_REASON_MESH_CLOSE_RCVD) { - ap_free_sta(hapd, sta); - return; - } - - wpa_mesh_set_plink_state(wpa_s, sta, PLINK_LISTEN); - sta->my_lid = sta->peer_lid = sta->mpm_close_reason = 0; - sta->mpm_retries = 0; + ap_free_sta(hapd, sta); }