qcacld-3.0: Set RM capability independent of AP's capability

qcacld-2.0 to qcacld-3.0 propagation

Remove check for AP's capability information to set station's
radio measurement(RM) capability in Capability Information element.

Change-Id: I6047d4dec19e7cd32d6733e4da773875bbbb31aa
CRs-Fixed: 924420

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

@@ -436,10 +436,11 @@ void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
 		 */
 		caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
 
-	/* Clear rrm bit if AP doesn't support it */
-	if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo
-		& LIM_RRM_BIT_MASK))
-		caps &= (~LIM_RRM_BIT_MASK);
+	/*
+	 * RM capability should be independent of AP's capabilities
+	 * Refer 8.4.1.4 Capability Information field in 802.11-2012
+	 * Do not modify it.
+	 */
 
 	/* Clear short preamble bit if AP does not support it */
 	if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &

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

@@ -1713,8 +1713,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 		pe_session);
 
 #if defined WLAN_FEATURE_VOWIFI
-	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
-	    SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps))
+	if (mac_ctx->rrm.rrmPEContext.rrmEnable)
 		populate_dot11f_rrm_ie(mac_ctx, &frm->RRMEnabledCap,
 			pe_session);
 #endif
@@ -2091,10 +2090,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 		pe_session);
 
 #if defined WLAN_FEATURE_VOWIFI
-	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
-	    SIR_MAC_GET_RRM(pe_session->limReassocBssCaps)) {
+	if (mac_ctx->rrm.rrmPEContext.rrmEnable)
 		populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session);
-	}
 #endif
 
 	/*
@@ -2563,10 +2560,8 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 				       &frm.ExtSuppRates, psessionEntry);
 
 #if defined WLAN_FEATURE_VOWIFI
-	if (pMac->rrm.rrmPEContext.rrmEnable &&
-	    SIR_MAC_GET_RRM(psessionEntry->limReassocBssCaps)) {
+	if (pMac->rrm.rrmPEContext.rrmEnable)
 		populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry);
-	}
 #endif
 	/* The join request *should* contain zero or one of the WPA and RSN */
 	/* IEs.  The payload send along with the request is a */