Ver Fonte

qcacld-3.0: Rename currDeviceMode

The Linux Coding Style frowns upon mixed-case names so rename
currDeviceMode in struct sme_context to be compliant.

Change-Id: I26ca94487c4f037098e06f0dd820360d90cb276b
CRs-Fixed: 2400316
Jeff Johnson há 6 anos atrás
pai
commit
5a6a0c90ea

+ 8 - 1
core/sme/inc/sme_api.h

@@ -408,8 +408,15 @@ QDF_STATUS sme_open_session(mac_handle_t mac_handle,
  * Other status means SME is failed to open the session.
  */
 QDF_STATUS sme_close_session(mac_handle_t mac_handle, uint8_t sessionId);
+
+/**
+ * sme_set_curr_device_mode() - Sets the current operating device mode.
+ * @mac_handle: The handle returned by mac_open.
+ * @curr_device_mode: Current operating device mode.
+ */
 void sme_set_curr_device_mode(mac_handle_t mac_handle,
-			      enum QDF_OPMODE currDeviceMode);
+			      enum QDF_OPMODE curr_device_mode);
+
 QDF_STATUS sme_update_roam_params(mac_handle_t mac_handle,
 				  uint8_t session_id,
 				  struct roam_ext_params *roam_params_src,

+ 1 - 1
core/sme/inc/sme_internal.h

@@ -258,7 +258,7 @@ struct sme_context {
 	/* following pointer contains array of pointers for tSmeCmd* */
 	void **sme_cmd_buf_addr;
 	tDblLinkList sme_cmd_freelist;    /* preallocated roam cmd list */
-	enum QDF_OPMODE currDeviceMode;
+	enum QDF_OPMODE curr_device_mode;
 	tSmePeerInfoHddCbkInfo peerInfoParams;
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 	host_event_wlan_status_payload_type eventPayload;

+ 3 - 9
core/sme/src/common/sme_api.c

@@ -708,7 +708,7 @@ QDF_STATUS sme_open(mac_handle_t mac_handle)
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 
 	mac->sme.state = SME_STATE_STOP;
-	mac->sme.currDeviceMode = QDF_STA_MODE;
+	mac->sme.curr_device_mode = QDF_STA_MODE;
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(
 					&mac->sme.sme_global_lock))) {
 		sme_err("Init lock failed");
@@ -7394,18 +7394,12 @@ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value)
 	return csr_convert_cb_ini_value_to_phy_cb_state(cb_ini_value);
 }
 
-/*
- * sme_set_curr_device_mode() - Sets the current operating device mode.
- *
- * mac_handle - The handle returned by mac_open.
- * currDeviceMode - Current operating device mode.
- */
 void sme_set_curr_device_mode(mac_handle_t mac_handle,
-				enum QDF_OPMODE currDeviceMode)
+			      enum QDF_OPMODE curr_device_mode)
 {
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 
-	mac->sme.currDeviceMode = currDeviceMode;
+	mac->sme.curr_device_mode = curr_device_mode;
 }
 
 /*

+ 4 - 4
core/sme/src/csr/csr_api_roam.c

@@ -16043,11 +16043,11 @@ QDF_STATUS csr_issue_add_sta_for_session_req(struct mac_context *mac,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	csr_get_vdev_type_nss(mac, mac->sme.currDeviceMode,
-			&nss_2g, &nss_5g);
+	csr_get_vdev_type_nss(mac, mac->sme.curr_device_mode,
+			      &nss_2g, &nss_5g);
 	qdf_mem_copy(add_sta_self_req->self_mac_addr, sessionMacAddr,
-			sizeof(tSirMacAddr));
-	add_sta_self_req->curr_device_mode = mac->sme.currDeviceMode;
+		     sizeof(tSirMacAddr));
+	add_sta_self_req->curr_device_mode = mac->sme.curr_device_mode;
 	add_sta_self_req->session_id = sessionId;
 	add_sta_self_req->type = type;
 	add_sta_self_req->sub_type = subType;

+ 1 - 1
core/wma/src/wma_features.c

@@ -5316,7 +5316,7 @@ int wma_chan_info_event_handler(void *handle, uint8_t *event_buf,
 	}
 
 	if (mac->sap.acs_with_more_param &&
-	    mac->sme.currDeviceMode == QDF_SAP_MODE) {
+	    mac->sme.curr_device_mode == QDF_SAP_MODE) {
 		param_buf = (WMI_CHAN_INFO_EVENTID_param_tlvs *) event_buf;
 		if (!param_buf)  {
 			WMA_LOGE("Invalid chan info event buffer");