Browse Source

qcacld-3.0: (part-2) Remove obsoleted BTAMP feature

Remove all the code written to support this feature as this feature
has been obsoleted for all next gen projects.

Change-Id: Ia48baa2d67ff4269fe3b9a137ed592da851abc18
CRs-Fixed: 992930
Rajeev Kumar 9 years ago
parent
commit
be5d7fdf27

+ 16 - 34
core/mac/src/pe/lim/lim_assoc_utils.c

@@ -109,8 +109,7 @@ lim_compare_capabilities(tpAniSirGlobal pMac,
 {
 	uint32_t val;
 
-	if ((LIM_IS_AP_ROLE(psessionEntry) ||
-	     LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) &&
+	if (LIM_IS_AP_ROLE(psessionEntry) &&
 	    (pAssocReq->capabilityInfo.ibss)) {
 		/* Requesting STA asserting IBSS capability. */
 		lim_log(pMac, LOG1,
@@ -152,8 +151,7 @@ lim_compare_capabilities(tpAniSirGlobal pMac,
 	 * then AP must reject any station that does not support
 	 * shortSlot
 	 */
-	if ((LIM_IS_AP_ROLE(psessionEntry) ||
-	     LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) &&
+	if (LIM_IS_AP_ROLE(psessionEntry) &&
 	    (pLocalCapabs->shortSlotTime == 1)) {
 		if (wlan_cfg_get_int
 			    (pMac, WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY,
@@ -586,8 +584,7 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 			 * There is no context at Polaris to delete.
 			 * Release our assigned AID back to the free pool
 			 */
-			if (LIM_IS_AP_ROLE(psessionEntry) ||
-			    LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+			if (LIM_IS_AP_ROLE(psessionEntry)) {
 				lim_release_peer_idx(pMac, pStaDs->assocId,
 						     psessionEntry);
 			}
@@ -612,8 +609,7 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 		return eSIR_SUCCESS;
 	pStaDs->mlmStaContext.mlmState = eLIM_MLM_WT_DEL_STA_RSP_STATE;
 
-	if (LIM_IS_STA_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+	if (LIM_IS_STA_ROLE(psessionEntry)) {
 		MTRACE(mac_trace
 		       (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId,
 		       eLIM_MLM_WT_DEL_STA_RSP_STATE));
@@ -671,8 +667,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr,
 		mlmStaContext.cleanupTrigger, statusCode,
 		MAC_ADDR_ARRAY(sta_dsaddr.bytes));
 
-	if (LIM_IS_STA_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+	if (LIM_IS_STA_ROLE(psessionEntry)) {
 		/* Set BSSID at CFG to null */
 		tSirMacAddr nullAddr = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
@@ -2115,8 +2110,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
 	}
 	qdf_mem_set((uint8_t *) add_sta_params, sizeof(tAddStaParams), 0);
 
-	if (LIM_IS_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry) ||
-	    LIM_IS_BT_AMP_AP_ROLE(session_entry))
+	if (LIM_IS_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry))
 		sta_Addr = &sta_ds->staAddr;
 #ifdef FEATURE_WLAN_TDLS
 	/* SystemRole shouldn't be matter if staType is TDLS peer */
@@ -2188,7 +2182,6 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
 	/* Update HT Capability */
 
 	if (LIM_IS_AP_ROLE(session_entry) ||
-	    LIM_IS_BT_AMP_AP_ROLE(session_entry) ||
 	    LIM_IS_IBSS_ROLE(session_entry)) {
 		add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability;
 		add_sta_params->vhtCapable =
@@ -2532,12 +2525,10 @@ lim_del_sta(tpAniSirGlobal pMac,
 	/* */
 
 #ifdef FEATURE_WLAN_TDLS
-	if ((LIM_IS_STA_ROLE(psessionEntry) &&
-	    (pStaDs->staType != STA_ENTRY_TDLS_PEER)) ||
-	    LIM_IS_BT_AMP_STA_ROLE(psessionEntry))
+	if (LIM_IS_STA_ROLE(psessionEntry) &&
+	    (pStaDs->staType != STA_ENTRY_TDLS_PEER))
 #else
-	if (LIM_IS_STA_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_STA_ROLE(psessionEntry))
+	if (LIM_IS_STA_ROLE(psessionEntry))
 #endif
 		pDelStaParams->staIdx = psessionEntry->staId;
 
@@ -2560,8 +2551,7 @@ lim_del_sta(tpAniSirGlobal pMac,
 			SET_LIM_STA_CONTEXT_MLM_STATE(pStaDs,
 						      eLIM_MLM_WT_DEL_STA_RSP_STATE);
 		}
-		if (LIM_IS_STA_ROLE(psessionEntry) ||
-		    LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+		if (LIM_IS_STA_ROLE(psessionEntry)) {
 			MTRACE(mac_trace
 				       (pMac, TRACE_CODE_MLM_STATE,
 				       psessionEntry->peSessionId,
@@ -2982,8 +2972,7 @@ void lim_handle_cnf_wait_timeout(tpAniSirGlobal pMac, uint16_t staId)
 		       )
 		lim_print_mac_addr(pMac, pStaDs->staAddr, LOGW);
 
-		if (LIM_IS_AP_ROLE(psessionEntry) ||
-		    LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+		if (LIM_IS_AP_ROLE(psessionEntry)) {
 			lim_reject_association(pMac, pStaDs->staAddr,
 					       pStaDs->mlmStaContext.subType,
 					       true,
@@ -3144,8 +3133,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
 		return;
 	}
 
-	if (!(LIM_IS_BT_AMP_STA_ROLE(session_entry) ||
-		LIM_IS_STA_ROLE(session_entry)))
+	if (!LIM_IS_STA_ROLE(session_entry))
 		return;
 
 	lim_log(mac_ctx, LOG1,
@@ -3545,11 +3533,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
 	lim_log(pMac, LOG1, FL("BSSID: " MAC_ADDRESS_STR),
 		MAC_ADDR_ARRAY(pAddBssParams->bssId));
 
-	if (psessionEntry->bssType == eSIR_BTAMP_AP_MODE) {
-		pAddBssParams->bssType = eSIR_BTAMP_AP_MODE;
-	} else {
-		pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE;
-	}
+	pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE;
 
 	pAddBssParams->operMode = BSS_OPERATIONAL_MODE_STA;
 
@@ -4593,15 +4577,13 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 		     pStaDs->staAddr, QDF_MAC_ADDR_SIZE);
 
 	mlmStaContext = pStaDs->mlmStaContext;
-	if (LIM_IS_AP_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+	if (LIM_IS_AP_ROLE(psessionEntry))
 		lim_release_peer_idx(pMac, pStaDs->assocId, psessionEntry);
-	}
+
 	lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, pStaDs->assocId,
 				  psessionEntry);
 
-	if (LIM_IS_STA_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+	if (LIM_IS_STA_ROLE(psessionEntry)) {
 		psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE;
 		MTRACE(mac_trace(pMac, TRACE_CODE_MLM_STATE,
 				 psessionEntry->peSessionId,

+ 0 - 2
core/mac/src/pe/lim/lim_ft_preauth.c

@@ -457,8 +457,6 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status,
 
 		if (pftSessionEntry->bssType == eSIR_INFRASTRUCTURE_MODE)
 			pftSessionEntry->limSystemRole = eLIM_STA_ROLE;
-		else if (pftSessionEntry->bssType == eSIR_BTAMP_AP_MODE)
-			pftSessionEntry->limSystemRole = eLIM_BT_AMP_STA_ROLE;
 		else
 			lim_log(pMac, LOGE, FL("Invalid bss type"));
 		pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState;

+ 2 - 4
core/mac/src/pe/lim/lim_link_monitoring_algo.c

@@ -102,8 +102,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg,
 		return;
 	}
 
-	if (LIM_IS_BT_AMP_AP_ROLE(session_entry) ||
-	    LIM_IS_AP_ROLE(session_entry)) {
+	if (LIM_IS_AP_ROLE(session_entry)) {
 		lim_log(mac_ctx, LOG1,
 			FL("Delete Station staId: %d, assocId: %d"),
 			msg->staId, msg->assocId);
@@ -432,8 +431,7 @@ void lim_handle_heart_beat_failure(tpAniSirGlobal mac_ctx,
 	/* Ensure HB Status for the session has been reseted */
 	session->LimHBFailureStatus = false;
 
-	if ((LIM_IS_STA_ROLE(session) ||
-	     LIM_IS_BT_AMP_STA_ROLE(session)) &&
+	if (LIM_IS_STA_ROLE(session) &&
 	    (session->limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE) &&
 	    (session->limSmeState != eLIM_SME_WT_DISASSOC_STATE) &&
 	    (session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) {

+ 3 - 6
core/mac/src/pe/lim/lim_process_action_frame.c

@@ -717,8 +717,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
 	lim_log(mac_ctx, LOGW, "Recv AddTs Response");
-	if (LIM_IS_AP_ROLE(session) ||
-	    LIM_IS_BT_AMP_AP_ROLE(session)) {
+	if (LIM_IS_AP_ROLE(session)) {
 		lim_log(mac_ctx, LOGW,
 			FL("AddTsRsp recvd at AP: ignoring"));
 		return;
@@ -1015,8 +1014,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 		}
 	}
 
-	if (!LIM_IS_AP_ROLE(session) &&
-	    !LIM_IS_BT_AMP_AP_ROLE(session))
+	if (!LIM_IS_AP_ROLE(session))
 		lim_send_sme_delts_ind(mac_ctx, &delts, aid, session);
 
 	/* try to delete the TS */
@@ -1680,8 +1678,7 @@ lim_drop_unprotected_action_frame(tpAniSirGlobal pMac, tpPESession psessionEntry
 	tpDphHashNode pStaDs;
 	bool rmfConnection = false;
 
-	if (LIM_IS_AP_ROLE(psessionEntry) ||
-	    LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+	if (LIM_IS_AP_ROLE(psessionEntry)) {
 		pStaDs =
 			dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
 					      &psessionEntry->dph.dphHashTable);

+ 1 - 1
core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -1740,7 +1740,7 @@ void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 		session->peSessionId, GET_LIM_SYSTEM_ROLE(session),
 		session->limMlmState, MAC_ADDR_ARRAY(hdr->sa));
 
-	if (LIM_IS_STA_ROLE(session) || LIM_IS_BT_AMP_STA_ROLE(session)) {
+	if (LIM_IS_STA_ROLE(session)) {
 		lim_log(mac_ctx, LOGE,
 			FL("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type=%d for role=%d from: "
 			   MAC_ADDRESS_STR),

+ 2 - 6
core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -573,8 +573,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 		return;
 	}
 
-	if (LIM_IS_AP_ROLE(session_entry) ||
-		LIM_IS_BT_AMP_AP_ROLE(session_entry)) {
+	if (LIM_IS_AP_ROLE(session_entry)) {
 		/*
 		 * Should not have received Re/Association
 		 * Response frame on AP. Log error
@@ -842,10 +841,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 		return;
 	}
 #endif
-	if (!((session_entry->bssType == eSIR_BTAMP_STA_MODE) ||
-		((session_entry->bssType == eSIR_BTAMP_AP_MODE) &&
-		LIM_IS_BT_AMP_STA_ROLE(session_entry)) ||
-		lim_is_roam_synch_in_progress(session_entry))) {
+	if (!lim_is_roam_synch_in_progress(session_entry)) {
 		if (lim_set_link_state
 			(mac_ctx, eSIR_LINK_POSTASSOC_STATE,
 			session_entry->bssId,

+ 4 - 9
core/mac/src/pe/lim/lim_process_auth_frame.c

@@ -83,14 +83,12 @@ static inline unsigned int is_auth_valid(tpAniSirGlobal pMac,
 
 	if (((auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_1) ||
 	    (auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_3)) &&
-	    (LIM_IS_STA_ROLE(sessionEntry) ||
-	    LIM_IS_BT_AMP_STA_ROLE(sessionEntry)))
+	    (LIM_IS_STA_ROLE(sessionEntry)))
 		valid = 0;
 
 	if (((auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_2) ||
 	    (auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_4)) &&
-	    (LIM_IS_AP_ROLE(sessionEntry) ||
-	    LIM_IS_BT_AMP_AP_ROLE(sessionEntry)))
+	    (LIM_IS_AP_ROLE(sessionEntry)))
 		valid = 0;
 
 	if (((auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_3) ||
@@ -521,8 +519,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
 		 * Check if a Reassociation is in progress and this is a
 		 * Pre-Auth frame
 		 */
-		if ((LIM_IS_STA_ROLE(pe_session) ||
-		     LIM_IS_BT_AMP_STA_ROLE(pe_session)) &&
+		if (LIM_IS_STA_ROLE(pe_session) &&
 		    (pe_session->limSmeState == eLIM_SME_WT_REASSOC_STATE) &&
 		    (rx_auth_frm_body->authStatusCode ==
 				eSIR_MAC_SUCCESS_STATUS) &&
@@ -783,7 +780,6 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx,
 	}
 
 	if (LIM_IS_AP_ROLE(pe_session) ||
-			LIM_IS_BT_AMP_AP_ROLE(pe_session) ||
 			LIM_IS_IBSS_ROLE(pe_session)) {
 		/*
 		 * Check if wep bit was set in FC. If not set,
@@ -1149,8 +1145,7 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 		 * of wep bit (this status code does not exist though) or
 		 * Out-of-sequence-Authentication-Frame status code.
 		 */
-		if (LIM_IS_STA_ROLE(pe_session) ||
-				LIM_IS_BT_AMP_STA_ROLE(pe_session)) {
+		if (LIM_IS_STA_ROLE(pe_session)) {
 			auth_frame.authAlgoNumber = eSIR_SHARED_KEY;
 			auth_frame.authTransactionSeqNumber =
 				SIR_MAC_AUTH_FRAME_4;