Revert "qcacld-3.0: Stop assoc failure timer before starting pmf timeout"

This reverts commit I04358e4d0fbe54552f4b387789a256f45dc7e20f.
As part of initial Assoc request, host starts Assoc failure
timer , if AP sends Assoc response with pmf timeout, host
stops the Assoc failure timer and starts pmf timer. After
pmf timer expires as part of Assoc request host freshly starts
Assoc failure timer.
Instead of stopping and restarting the Assoc failure timer
host should use the initial timer for the complete Association
process.

CRs-Fixed: 3629968
Change-Id: Iefafe9ffbccd0f40c8add13ad7bfcc08344d476d

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -1361,12 +1361,6 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		lim_add_bssid_to_reject_list(mac_ctx->pdev, &ap_info);
 	}
 
-	/* Stop Association failure timer */
-	if (subtype == LIM_ASSOC)
-		lim_deactivate_and_change_timer(mac_ctx, eLIM_ASSOC_FAIL_TIMER);
-	else
-		lim_stop_reassoc_retry_timer(mac_ctx);
-
 	status = lim_handle_pmfcomeback_timer(session_entry, assoc_rsp);
 	/* return if retry again timer is started and ignore this assoc resp */
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -1376,6 +1370,12 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		return;
 	}
 
+	/* Stop Association failure timer */
+	if (subtype == LIM_ASSOC)
+		lim_deactivate_and_change_timer(mac_ctx, eLIM_ASSOC_FAIL_TIMER);
+	else
+		lim_stop_reassoc_retry_timer(mac_ctx);
+
 	if (assoc_rsp->status_code != STATUS_SUCCESS) {
 		/*
 		 *Re/Association response was received