Browse Source

qcacld-3.0: Fix sme_update_tgt_he_cap param and indent

Fix checkpatch issue introduced by change "qcacld-3.0:
separate HE caps per band", use new mac_handle_t instead
of tHalHandle in sme_update_tgt_he_cap param and fix
indent issue.

Change-Id: I91e11fd38ac72266b4afcf42d71340975127f559
CRs-Fixed: 2268400
Jinwei Chen 6 years ago
parent
commit
ef742dc73c
4 changed files with 18 additions and 17 deletions
  1. 5 5
      core/sme/inc/sme_api.h
  2. 6 6
      core/sme/src/common/sme_api.c
  3. 3 2
      core/sme/src/csr/csr_api_roam.c
  4. 4 4
      core/wma/src/wma_he.c

+ 5 - 5
core/sme/inc/sme_api.h

@@ -2265,12 +2265,12 @@ int sme_set_auto_rate_he_ltf(tHalHandle hal, uint8_t session_id,
 #ifdef WLAN_FEATURE_11AX
 /**
  * sme_update_tgt_he_cap() - sets the HE caps to pmac
- * @hal: Pointer to HAL
- * @cfg: Pointer to wma target cfg
+ * @mac_handle: Pointer to MAC handle
+ * @cfg: Pointer to WMA target CFG
  *
  * Return: None
  */
-void sme_update_tgt_he_cap(tHalHandle hal, struct wma_tgt_cfg *cfg);
+void sme_update_tgt_he_cap(mac_handle_t mac_handle, struct wma_tgt_cfg *cfg);
 
 /**
  * sme_update_he_cap_nss() - sets the nss based on user request
@@ -2344,8 +2344,8 @@ int sme_update_he_frag_supp(tHalHandle hal, uint8_t session_id,
 int sme_update_he_ldpc_supp(tHalHandle hal, uint8_t session_id,
 			    uint16_t he_ldpc);
 #else
-static inline void sme_update_tgt_he_cap(tHalHandle hal,
-		struct wma_tgt_cfg *cfg)
+static inline void sme_update_tgt_he_cap(mac_handle_t mac_handle,
+					 struct wma_tgt_cfg *cfg)
 {}
 static inline void sme_update_he_cap_nss(tHalHandle hal, uint8_t session_id,
 		uint8_t nss)

+ 6 - 6
core/sme/src/common/sme_api.c

@@ -12769,17 +12769,17 @@ int sme_update_tx_bfee_supp(tHalHandle hal, uint8_t session_id,
 	return sme_update_he_tx_bfee_supp(hal, session_id, cfg_val);
 }
 #ifdef WLAN_FEATURE_11AX
-void sme_update_tgt_he_cap(tHalHandle hal, struct wma_tgt_cfg *cfg)
+void sme_update_tgt_he_cap(mac_handle_t mac_handle, struct wma_tgt_cfg *cfg)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
+	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
 
 	qdf_mem_copy(&mac_ctx->he_cap_2g,
-		&cfg->he_cap_2g,
-		sizeof(tDot11fIEhe_cap));
+		     &cfg->he_cap_2g,
+		     sizeof(tDot11fIEhe_cap));
 
 	qdf_mem_copy(&mac_ctx->he_cap_5g,
-		&cfg->he_cap_5g,
-		sizeof(tDot11fIEhe_cap));
+		     &cfg->he_cap_5g,
+		     sizeof(tDot11fIEhe_cap));
 }
 
 void sme_update_he_cap_nss(tHalHandle hal, uint8_t session_id,

+ 3 - 2
core/sme/src/csr/csr_api_roam.c

@@ -15817,7 +15817,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 			csr_join_req_copy_he_cap(csr_join_req, pSession);
 			/* change the HE caps like sts per band */
 			CSR_REVISE_REQ_HE_CAP_PER_BAND(csr_join_req, pMac,
-						pBssDescription->channelId);
+						       pBssDescription->
+						       channelId);
 		}
 
 		if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP,
@@ -16732,7 +16733,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t
 		csr_start_bss_copy_he_cap(pMsg, pSession);
 		/* change the HE caps like sts per band */
 		CSR_REVISE_REQ_HE_CAP_PER_BAND(pMsg, pMac,
-					pBssDesc->channelId);
+					       pBssDesc->channelId);
 	}
 
 	qdf_mem_copy(&pMsg->addIeParams,

+ 4 - 4
core/wma/src/wma_he.c

@@ -869,9 +869,9 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 
 		if (he_cap_mac.present) {
 			wma_derive_ext_he_cap(&tmp_he_cap,
-					&he_cap_mac);
+					      &he_cap_mac);
 			wma_derive_ext_he_cap(&tgt_cfg->he_cap_2g,
-					&he_cap_mac);
+					      &he_cap_mac);
 		}
 
 		qdf_mem_zero(&he_cap_mac,
@@ -892,9 +892,9 @@ void wma_update_target_ext_he_cap(struct target_psoc_info *tgt_hdl,
 		}
 		if (he_cap_mac.present) {
 			wma_derive_ext_he_cap(&tmp_he_cap,
-					&he_cap_mac);
+					      &he_cap_mac);
 			wma_derive_ext_he_cap(&tgt_cfg->he_cap_5g,
-					&he_cap_mac);
+					      &he_cap_mac);
 		}
 	}