Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2113a656 authored by Abhishek Ambure's avatar Abhishek Ambure Committed by nshrivas
Browse files

qcacld-3.0: Add support of pmf comeback timer for SAE assoc retry 

If STA DUT receives assoc response with assoc response status as
eSIR_MAC_TRY_AGAIN_LATER, host starts a pmf comeback timer to
send assoc request again on pmf comeback timer timeout.

Change-Id: Ifb28e44af86daef90db7146572cdfae26dfcaa20
CRs-Fixed: 2728459
parent e5793257

core/mac/src/pe/include/lim_session.h

+6 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ typedef struct sPowersaveoffloadInfo { 
#ifdef WLAN_FEATURE_11W

struct comeback_timer_info {

	struct mac_context *mac;

	uint8_t session_id;

	uint8_t vdev_id;

	uint8_t retried;

	tLimMlmStates lim_prev_mlm_state;  /* Previous MLM State */

	tLimMlmStates lim_mlm_state;       /* MLM State */

};
@@ -481,6 +482,10 @@ struct pe_session { 
	/* Fast Transition (FT) */

	tftPEContext ftPEContext;

	bool isNonRoamReassoc;

#ifdef WLAN_FEATURE_11W

	qdf_mc_timer_t pmf_retry_timer;

	struct comeback_timer_info pmf_retry_timer_info;

#endif /* WLAN_FEATURE_11W */

	uint8_t  is_key_installed;

	/* timer for resetting protection fileds at regular intervals */

	qdf_mc_timer_t protection_fields_reset_timer;

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

+16 −0
Original line number Diff line number Diff line
@@ -596,6 +596,21 @@ static inline void lim_nan_register_callbacks(struct mac_context *mac_ctx) 
}

#endif



#ifdef WLAN_FEATURE_11W

static void lim_stop_pmfcomeback_timer(struct pe_session *session)

{

	if (session->opmode != QDF_STA_MODE)

		return;



	qdf_mc_timer_stop(&session->pmf_retry_timer);

	session->pmf_retry_timer_info.retried = false;

}

#else

static void lim_stop_pmfcomeback_timer(struct pe_session *session)

{

}

#endif



/*

 * pe_shutdown_notifier_cb - Shutdown notifier callback

 * @ctx: Pointer to Global MAC structure
@@ -615,6 +630,7 @@ static void pe_shutdown_notifier_cb(void *ctx) 
			if (LIM_IS_AP_ROLE(session))

				qdf_mc_timer_stop(&session->

						 protection_fields_reset_timer);

			lim_stop_pmfcomeback_timer(session);

		}

	}

}

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

+72 −0
Original line number Diff line number Diff line
@@ -568,6 +568,68 @@ static inline void lim_process_he_info(tpSirProbeRespBeacon beacon, 
}

#endif



#ifdef WLAN_FEATURE_11W



#define MAX_RETRY_TIMER 1500

static QDF_STATUS

lim_handle_pmfcomeback_timer(struct pe_session *session_entry,

			     tpSirAssocRsp assoc_rsp)

{

	uint16_t timeout_value;



	if (session_entry->opmode != QDF_STA_MODE)

		return QDF_STATUS_E_FAILURE;



	if (session_entry->limRmfEnabled &&

	    session_entry->pmf_retry_timer_info.retried &&

	    assoc_rsp->status_code == eSIR_MAC_TRY_AGAIN_LATER) {

		pe_debug("Already retry in progress");

		return QDF_STATUS_SUCCESS;

	}



	/*

	 * Handle association Response for sta mode with RMF enabled and TRY

	 * again later with timeout interval and Assoc comeback type

	 */

	if (!session_entry->limRmfEnabled || assoc_rsp->status_code !=

	    eSIR_MAC_TRY_AGAIN_LATER || !assoc_rsp->TimeoutInterval.present ||

	    assoc_rsp->TimeoutInterval.timeoutType !=

	    SIR_MAC_TI_TYPE_ASSOC_COMEBACK ||

	    session_entry->pmf_retry_timer_info.retried)

		return QDF_STATUS_E_FAILURE;



	timeout_value = assoc_rsp->TimeoutInterval.timeoutValue;

	if (timeout_value < 10) {

		/*

		 * if this value is less than 10 then our timer

		 * will fail to start and due to this we will

		 * never re-attempt. Better modify the timer

		 * value here.

		 */

		timeout_value = 10;

	}

	timeout_value = QDF_MIN(MAX_RETRY_TIMER, timeout_value);

	pe_debug("ASSOC res with eSIR_MAC_TRY_AGAIN_LATER recvd.Starting timer to wait timeout: %d",

		 timeout_value);

	if (QDF_STATUS_SUCCESS !=

	    qdf_mc_timer_start(&session_entry->pmf_retry_timer,

			       timeout_value)) {

		pe_err("Failed to start comeback timer");

		return QDF_STATUS_E_FAILURE;

	}

	session_entry->pmf_retry_timer_info.retried = true;



	return QDF_STATUS_SUCCESS;

}

#else

static QDF_STATUS

lim_handle_pmfcomeback_timer(struct pe_session *session_entry,

			     tpSirAssocRsp assoc_rsp)

{

	return QDF_STATUS_E_FAILURE;

}

#endif



/**

 * lim_process_assoc_rsp_frame() - Processes assoc response

 * @mac_ctx: Pointer to Global MAC structure
@@ -601,6 +663,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, 
#endif

	uint8_t ap_nss;

	int8_t rssi;

	QDF_STATUS status;



#ifdef WLAN_FEATURE_ROAM_OFFLOAD

	vdev_id = session_entry->vdev_id;
@@ -810,6 +873,15 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, 
		qdf_mem_copy(ap_info.bssid.bytes, hdr->sa, QDF_MAC_ADDR_SIZE);

		lim_add_bssid_to_reject_list(mac_ctx->pdev, &ap_info);

	}



	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)) {

		qdf_mem_free(beacon);

		qdf_mem_free(assoc_rsp);

		return;

	}



	if (assoc_rsp->status_code != eSIR_MAC_SUCCESS_STATUS) {

		/*

		 *Re/Association response was received

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

+22 −0
Original line number Diff line number Diff line
@@ -802,6 +802,27 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg) 
			     (uint32_t *) &mlm_auth_cnf);

}



#ifdef WLAN_FEATURE_11W

static void lim_store_pmfcomeback_timerinfo(struct pe_session *session_entry)

{

	if (session_entry->opmode != QDF_STA_MODE ||

	    !session_entry->limRmfEnabled)

		return;

	/*

	 * Store current MLM state in case ASSOC response returns with

	 * TRY_AGAIN_LATER return code.

	 */

	session_entry->pmf_retry_timer_info.lim_prev_mlm_state =

		session_entry->limPrevMlmState;

	session_entry->pmf_retry_timer_info.lim_mlm_state =

		session_entry->limMlmState;

}

#else

static void lim_store_pmfcomeback_timerinfo(struct pe_session *session_entry)

{

}

#endif /* WLAN_FEATURE_11W */



/**

 * lim_process_mlm_assoc_req() - This function is called to process

 * MLM_ASSOC_REQ message from SME
@@ -862,6 +883,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg 
	/* map the session entry pointer to the AssocFailureTimer */

	mac_ctx->lim.lim_timers.gLimAssocFailureTimer.sessionId =

		mlm_assoc_req->sessionId;

	lim_store_pmfcomeback_timerinfo(session_entry);

	session_entry->limPrevMlmState = session_entry->limMlmState;

	session_entry->limMlmState = eLIM_MLM_WT_ASSOC_RSP_STATE;

	MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE,

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

+32 −0
Original line number Diff line number Diff line
@@ -417,6 +417,38 @@ static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx, 
		(uint32_t *) assoc_req);

}



#ifdef WLAN_FEATURE_11W

/**

 * lim_pmf_comeback_timer_callback() -PMF callback handler

 * @context: Timer context

 *

 * This function is called to processes the PMF comeback

 * callback

 *

 * Return: None

 */

void lim_pmf_comeback_timer_callback(void *context)

{

	struct comeback_timer_info *info =

			(struct comeback_timer_info *)context;

	struct mac_context *mac_ctx = info->mac;

	struct pe_session *session;



	session = pe_find_session_by_vdev_id(mac_ctx, info->vdev_id);

	if (!session) {

		pe_err("no session found for vdev %d", info->vdev_id);

		return;

	}



	pe_info("comeback later timer expired. sending MLM ASSOC req for vdev %d",

		session->vdev_id);

	/* set MLM state such that ASSOC REQ packet will be sent out */

	session->limPrevMlmState = info->lim_prev_mlm_state;

	session->limMlmState = info->lim_mlm_state;

	lim_send_mlm_assoc_req(mac_ctx, session);

}

#endif /* WLAN_FEATURE_11W */



/**

 * lim_process_mlm_auth_cnf()-Process Auth confirmation

 * @mac_ctx:  Pointer to Global MAC structure