qcacld-3.0: Replace smeSessionId with vdevid in SME, HDD and WMA

Replace smeSessionId with vdevid in SME, HDD and WMA files.

Change-Id: I3b2f5dd08dac2d107f89762cd763a032b4867d16
CRs-Fixed: 2569192

core/hdd/src/wlan_hdd_cfg80211.c

@@ -20066,7 +20066,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 	/* Clearing add IE of beacon */
 	qdf_mem_copy(update_ie.bssid.bytes, adapter->mac_addr.bytes,
 		     sizeof(tSirMacAddr));
-	update_ie.smeSessionId = adapter->vdev_id;
+	update_ie.vdev_id = adapter->vdev_id;
 	update_ie.ieBufferlength = 0;
 	update_ie.pAdditionIEBuffer = NULL;
 	update_ie.append = true;

core/hdd/src/wlan_hdd_hostapd.c

@@ -4120,7 +4120,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
 	wlan_hdd_add_sap_obss_scan_ie(adapter, genie, &total_ielen);
 
 	qdf_copy_macaddr(&update_ie.bssid, &adapter->mac_addr);
-	update_ie.smeSessionId = adapter->vdev_id;
+	update_ie.vdev_id = adapter->vdev_id;
 
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
 		update_ie.ieBufferlength = total_ielen;
@@ -5775,7 +5775,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	}
 
 	qdf_copy_macaddr(&update_ie.bssid, &adapter->mac_addr);
-	update_ie.smeSessionId = adapter->vdev_id;
+	update_ie.vdev_id = adapter->vdev_id;
 	update_ie.ieBufferlength = 0;
 	update_ie.pAdditionIEBuffer = NULL;
 	update_ie.append = true;

core/hdd/src/wlan_hdd_ioctl.c

@@ -660,7 +660,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter,
 	qdf_copy_macaddr(&modify_ie.bssid,
 		     roam_profile->BSSIDs.bssid);
 
-	modify_ie.smeSessionId = adapter->vdev_id;
+	modify_ie.vdev_id = adapter->vdev_id;
 	modify_ie.notify = true;
 	modify_ie.ieID = WLAN_ELEMID_VENDOR;
 	modify_ie.ieIDLen = ibss_ie_length;

core/hdd/src/wlan_hdd_main.c

@@ -5717,7 +5717,7 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter)
 	}
 
 	qdf_copy_macaddr(&update_ie.bssid, bssid);
-	update_ie.smeSessionId = adapter->vdev_id;
+	update_ie.vdev_id = adapter->vdev_id;
 	update_ie.ieBufferlength = 0;
 	update_ie.pAdditionIEBuffer = NULL;
 	update_ie.append = true;
@@ -5992,7 +5992,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 
 			qdf_copy_macaddr(&update_ie.bssid,
 					 &adapter->mac_addr);
-			update_ie.smeSessionId = adapter->vdev_id;
+			update_ie.vdev_id = adapter->vdev_id;
 			update_ie.ieBufferlength = 0;
 			update_ie.pAdditionIEBuffer = NULL;
 			update_ie.append = false;

core/mac/inc/sir_api.h

@@ -2785,7 +2785,7 @@ typedef enum tUpdateIEsType {
 /* Modify particular IE in addition IE for prob resp Bcn */
 typedef struct sSirModifyIE {
 	struct qdf_mac_addr bssid;
-	uint16_t smeSessionId;
+	uint16_t vdev_id;
 	bool notify;
 	uint8_t ieID;
 	uint8_t ieIDLen;        /*ie length as per spec */
@@ -2811,7 +2811,7 @@ typedef struct sSirModifyIEsInd {
 /* Message format for Update IE message sent to PE  */
 typedef struct sSirUpdateIE {
 	struct qdf_mac_addr bssid;
-	uint16_t smeSessionId;
+	uint16_t vdev_id;
 	bool append;
 	bool notify;
 	uint16_t ieBufferlength;

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

@@ -68,7 +68,7 @@ typedef struct sSirFTPreAuthReq {
 typedef struct sSirFTPreAuthRsp {
 	uint16_t messageType;   /* eWNI_SME_FT_PRE_AUTH_RSP */
 	uint16_t length;
-	uint8_t smeSessionId;
+	uint8_t vdev_id;
 	tSirMacAddr preAuthbssId;       /* BSSID to preauth to */
 	QDF_STATUS status;
 	uint16_t ft_ies_length;
@@ -83,7 +83,7 @@ typedef struct sSirFTPreAuthRsp {
 typedef struct sSirFTUpdateKeyInfo {
 	uint16_t messageType;
 	uint16_t length;
-	uint32_t smeSessionId;
+	uint32_t vdev_id;
 	struct qdf_mac_addr bssid;
 	tSirKeyMaterial keyMaterial;
 } tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo;

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

@@ -607,7 +607,7 @@ void lim_post_ft_pre_auth_rsp(struct mac_context *mac_ctx,
 			qdf_mem_free(ft_pre_auth_rsp);
 			return;
 		}
-		ft_pre_auth_rsp->smeSessionId = session->smeSessionId;
+		ft_pre_auth_rsp->vdev_id = session->vdev_id;
 		/* The bssid of the AP we are sending Auth1 to. */
 		if (session->ftPEContext.pFTPreAuthReq)
 			sir_copy_mac_addr(ft_pre_auth_rsp->preAuthbssId,

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

@@ -77,7 +77,7 @@ QDF_STATUS lim_send_beacon_params(struct mac_context *mac,
 					pe_session->peSessionId,
 					msgQ.type));
 	}
-	pBcnParams->smeSessionId = pe_session->smeSessionId;
+	pBcnParams->vdev_id = pe_session->vdev_id;
 	retCode = wma_post_ctrl_msg(mac, &msgQ);
 	if (QDF_STATUS_SUCCESS != retCode) {
 		qdf_mem_free(pBcnParams);

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

@@ -248,8 +248,8 @@ static void pe_reset_protection_callback(void *ptr)
 					fLsigTXOPProtectionFullSupport;
 		beacon_params.fRIFSMode =
 				pe_session_entry->beaconParams.fRIFSMode;
-		beacon_params.smeSessionId =
-				pe_session_entry->smeSessionId;
+		beacon_params.vdev_id =
+				pe_session_entry->vdev_id;
 		beacon_params.paramChangeBitmap |= PARAM_llBCOEXIST_CHANGED;
 		bcn_prms_changed = true;
 	}

core/sme/inc/sme_ft_api.h

@@ -55,7 +55,7 @@ typedef struct sFTSMEContext {
 	/* Pre-Auth info */
 	tFTIEStates FTState;    /* The state of FT in the current 11rAssoc */
 	tSirMacAddr preAuthbssId;       /* BSSID to preauth to */
-	uint32_t smeSessionId;
+	uint32_t vdev_id;
 	/* Saved pFTPreAuthRsp */
 	tpSirFTPreAuthRsp psavedFTPreAuthRsp;
 	bool setFTPreAuthState;

core/sme/src/common/sme_ft_api.c

@@ -224,7 +224,7 @@ void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id,
 /**
  * sme_ft_send_update_key_ind() - To send key update indication for FT session
  * @mac: pointer to MAC context
- * @session_id: sme session id
+ * @vdev_id: vdev_id
  * @ftkey_info: FT key information
  *
  * To send key update indication for FT session
@@ -232,7 +232,7 @@ void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id,
  * Return: QDF_STATUS
  */
 static
-QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_id,
+QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t vdev_id,
 				      tCsrRoamSetKey *ftkey_info)
 {
 	tSirFTUpdateKeyInfo *msg;
@@ -275,7 +275,7 @@ QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_
 				ftkey_info->keyLength);
 
 	qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
-	msg->smeSessionId = session_id;
+	msg->vdev_id = vdev_id;
 	sme_debug("BSSID = " QDF_MAC_ADDR_STR,
 		  QDF_MAC_ADDR_ARRAY(msg->bssid.bytes));
 	status = umac_send_mb_message_to_mac(msg);

core/sme/src/csr/csr_api_roam.c

@@ -20508,7 +20508,7 @@ csr_roam_modify_add_ies(struct mac_context *mac,
 
 	qdf_copy_macaddr(&pModifyAddIEInd->modifyIE.bssid, &pModifyIE->bssid);
 
-	pModifyAddIEInd->modifyIE.smeSessionId = pModifyIE->smeSessionId;
+	pModifyAddIEInd->modifyIE.vdev_id = pModifyIE->vdev_id;
 	pModifyAddIEInd->modifyIE.notify = pModifyIE->notify;
 	pModifyAddIEInd->modifyIE.ieID = pModifyIE->ieID;
 	pModifyAddIEInd->modifyIE.ieIDLen = pModifyIE->ieIDLen;
@@ -20571,7 +20571,7 @@ csr_roam_update_add_ies(struct mac_context *mac,
 
 	qdf_copy_macaddr(&pUpdateAddIEs->updateIE.bssid, &pUpdateIE->bssid);
 
-	pUpdateAddIEs->updateIE.smeSessionId = pUpdateIE->smeSessionId;
+	pUpdateAddIEs->updateIE.vdev_id = pUpdateIE->vdev_id;
 	pUpdateAddIEs->updateIE.append = pUpdateIE->append;
 	pUpdateAddIEs->updateIE.notify = pUpdateIE->notify;
 	pUpdateAddIEs->updateIE.ieBufferlength = pUpdateIE->ieBufferlength;

core/sme/src/csr/csr_roam_preauth.c

@@ -518,7 +518,7 @@ static uint32_t csr_get_dot11_mode(struct mac_context *mac_ctx,
 }
 
 QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
-					 uint32_t session_id,
+					 uint32_t vdev_id,
 					 struct bss_description *bss_desc)
 {
 	tpSirFTPreAuthReq preauth_req;
@@ -527,15 +527,14 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 	uint32_t dot11mode, buf_len;
 	QDF_STATUS status;
 	struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx,
-				session_id);
+				vdev_id);
 
 	if (!csr_session) {
-		sme_err("Session does not exist for session id: %d",
-			session_id);
+		sme_err("Session does not exist for vdev_id: %d", vdev_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	dot11mode = csr_get_dot11_mode(mac_ctx, session_id, bss_desc);
+	dot11mode = csr_get_dot11_mode(mac_ctx, vdev_id, bss_desc);
 	if (!dot11mode) {
 		sme_err("dot11mode is zero");
 		return QDF_STATUS_E_FAILURE;
@@ -554,7 +553,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 	}
 
 	/* Save the SME Session ID. We need it while processing preauth resp */
-	csr_session->ftSmeContext.smeSessionId = session_id;
+	csr_session->ftSmeContext.vdev_id = vdev_id;
 	preauth_req->messageType = eWNI_SME_FT_PRE_AUTH_REQ;
 	preauth_req->pre_auth_channel_freq = bss_desc->chan_freq;
 	preauth_req->dot11mode = dot11mode;
@@ -567,8 +566,8 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 	qdf_mem_copy((void *)&preauth_req->self_mac_addr,
 		(void *)&csr_session->self_mac_addr.bytes, sizeof(tSirMacAddr));
 
-	if (csr_roam_is11r_assoc(mac_ctx, session_id) &&
-	     (mac_ctx->roam.roamSession[session_id].connectedProfile.AuthType !=
+	if (csr_roam_is11r_assoc(mac_ctx, vdev_id) &&
+	     (mac_ctx->roam.roamSession[vdev_id].connectedProfile.AuthType !=
 	      eCSR_AUTH_TYPE_OPEN_SYSTEM)) {
 		preauth_req->ft_ies_length =
 			(uint16_t) csr_session->ftSmeContext.auth_ft_ies_length;
@@ -595,9 +594,9 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_info *roam_info;
 	enum csr_akm_type conn_Auth_type;
-	uint32_t session_id = preauth_rsp->smeSessionId;
+	uint32_t vdev_id = preauth_rsp->vdev_id;
 	struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx,
-				session_id);
+				vdev_id);
 	tDot11fAuthentication *p_auth = NULL;
 
 	if (!csr_session) {
@@ -605,10 +604,10 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 		return;
 	}
 	status = csr_neighbor_roam_preauth_rsp_handler(mac_ctx,
-			preauth_rsp->smeSessionId, preauth_rsp->status);
+			preauth_rsp->vdev_id, preauth_rsp->status);
 	if (status != QDF_STATUS_SUCCESS) {
 		sme_err("Preauth was not processed: %d SessionID: %d",
-			status, session_id);
+			status, vdev_id);
 		return;
 	}
 
@@ -617,13 +616,13 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 	csr_session->ftSmeContext.FTState = eFT_AUTH_COMPLETE;
 	csr_session->ftSmeContext.psavedFTPreAuthRsp = preauth_rsp;
 	/* No need to notify qos module if this is a non 11r & ESE roam */
-	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId)
+	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->vdev_id)
 #ifdef FEATURE_WLAN_ESE
-		|| csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->smeSessionId)
+		|| csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->vdev_id)
 #endif
 	   ) {
 		sme_qos_csr_event_ind(mac_ctx,
-			csr_session->ftSmeContext.smeSessionId,
+			csr_session->ftSmeContext.vdev_id,
 			SME_QOS_CSR_PREAUTH_SUCCESS_IND, NULL);
 	}
 	status =
@@ -642,29 +641,29 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 	qdf_mem_copy((void *)&csr_session->ftSmeContext.preAuthbssId,
 		(void *)preauth_rsp->preAuthbssId,
 		sizeof(struct qdf_mac_addr));
-	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId))
-		csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId,
+	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->vdev_id))
+		csr_roam_call_callback(mac_ctx, preauth_rsp->vdev_id,
 			NULL, 0, eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE);
 
 #ifdef FEATURE_WLAN_ESE
-	if (csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->smeSessionId)) {
+	if (csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->vdev_id)) {
 		csr_roam_read_tsf(mac_ctx, (uint8_t *)&roam_info->timestamp,
-				  preauth_rsp->smeSessionId);
+				  preauth_rsp->vdev_id);
 		qdf_mem_copy((void *)&roam_info->bssid,
 			     (void *)preauth_rsp->preAuthbssId,
 			     sizeof(struct qdf_mac_addr));
-		csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId,
+		csr_roam_call_callback(mac_ctx, preauth_rsp->vdev_id,
 				       roam_info, 0,
 				       eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0);
 	}
 #endif
 
-	if (csr_roam_is_fast_roam_enabled(mac_ctx, preauth_rsp->smeSessionId)) {
+	if (csr_roam_is_fast_roam_enabled(mac_ctx, preauth_rsp->vdev_id)) {
 		/* Save the bssid from the received response */
 		qdf_mem_copy((void *)&roam_info->bssid,
 			     (void *)preauth_rsp->preAuthbssId,
 			     sizeof(struct qdf_mac_addr));
-		csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId,
+		csr_roam_call_callback(mac_ctx, preauth_rsp->vdev_id,
 				       roam_info, 0, eCSR_ROAM_PMK_NOTIFY, 0);
 	}
 
@@ -673,14 +672,14 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 	/* If its an Open Auth, FT IEs are not provided by supplicant */
 	/* Hence populate them here */
 	conn_Auth_type =
-		mac_ctx->roam.roamSession[session_id].connectedProfile.AuthType;
+		mac_ctx->roam.roamSession[vdev_id].connectedProfile.AuthType;
 
 	csr_session->ftSmeContext.addMDIE = false;
 
 	/* Done with it, init it. */
 	csr_session->ftSmeContext.psavedFTPreAuthRsp = NULL;
 
-	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId) &&
+	if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->vdev_id) &&
 			(conn_Auth_type == eCSR_AUTH_TYPE_OPEN_SYSTEM)) {
 		uint16_t ft_ies_length;
 

core/wma/inc/wma_if.h

@@ -532,7 +532,7 @@ typedef struct {
  * @fLsigTXOPProtectionFullSupport: TXOP protection supported or not
  * @fRIFSMode: RIFS mode
  * @paramChangeBitmap: change bitmap
- * @smeSessionId: SME  session id
+ * @vdev_id: vdev_id
  */
 typedef struct {
 	uint8_t bss_idx;
@@ -547,7 +547,7 @@ typedef struct {
 	uint8_t fLsigTXOPProtectionFullSupport;
 	uint8_t fRIFSMode;
 	uint16_t paramChangeBitmap;
-	uint8_t smeSessionId;
+	uint8_t vdev_id;
 	uint32_t bss_color;
 	bool bss_color_disabled;
 } tUpdateBeaconParams, *tpUpdateBeaconParams;

core/wma/src/wma_mgmt.c

@@ -1841,22 +1841,22 @@ wma_process_update_beacon_params(tp_wma_handle wma,
 		return;
 	}
 
-	if (bcn_params->smeSessionId >= wma->max_bssid) {
-		WMA_LOGE("Invalid vdev id %d", bcn_params->smeSessionId);
+	if (bcn_params->vdev_id >= wma->max_bssid) {
+		WMA_LOGE("Invalid vdev id %d", bcn_params->vdev_id);
 		return;
 	}
 
 	if (bcn_params->paramChangeBitmap & PARAM_BCN_INTERVAL_CHANGED) {
-		wma_update_beacon_interval(wma, bcn_params->smeSessionId,
+		wma_update_beacon_interval(wma, bcn_params->vdev_id,
 					   bcn_params->beaconInterval);
 	}
 
 	if (bcn_params->paramChangeBitmap & PARAM_llBCOEXIST_CHANGED)
-		wma_update_protection_mode(wma, bcn_params->smeSessionId,
+		wma_update_protection_mode(wma, bcn_params->vdev_id,
 					   bcn_params->llbCoexist);
 
 	if (bcn_params->paramChangeBitmap & PARAM_BSS_COLOR_CHANGED)
-		wma_update_bss_color(wma, bcn_params->smeSessionId,
+		wma_update_bss_color(wma, bcn_params->vdev_id,
 				     bcn_params);
 }