浏览代码

qcacld-3.0: Rename HDD Green AP APIs

Currently the HDD Green APIs do not have a consistent prefix. In
preparation for refactoring this feature, rename the HDD Green AP APIs
to have a consistent prefix.

Change-Id: Ib4d9a6db6ffacd9e19277d95f4976805d0bb6fa3
CRs-Fixed: 2216246
Jeff Johnson 7 年之前
父节点
当前提交
e8846abed9
共有 4 个文件被更改,包括 24 次插入24 次删除
  1. 2 2
      core/hdd/inc/wlan_hdd_main.h
  2. 5 5
      core/hdd/src/wlan_hdd_assoc.c
  3. 4 4
      core/hdd/src/wlan_hdd_hostapd.c
  4. 13 13
      core/hdd/src/wlan_hdd_main.c

+ 2 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -1940,7 +1940,7 @@ enum {
  */
 
 /**
- * hdd_start_green_ap_state_mc() - to start green AP state mc based on
+ * hdd_green_ap_start_state_mc() - to start green AP state mc based on
  *        present concurrency and state of green AP state machine.
  * @hdd_ctx: hdd context
  * @mode: device mode
@@ -1948,7 +1948,7 @@ enum {
  *
  * Return: 0 - success, < 0 - failure
  */
-int hdd_start_green_ap_state_mc(struct hdd_context *hdd_ctx,
+int hdd_green_ap_start_state_mc(struct hdd_context *hdd_ctx,
 				enum QDF_OPMODE mode, bool is_session_start);
 
 int hdd_validate_channel_and_bandwidth(struct hdd_adapter *adapter,

+ 5 - 5
core/hdd/src/wlan_hdd_assoc.c

@@ -1343,7 +1343,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		if (!hdd_is_roam_sync_in_progress(pCsrRoamInfo)) {
 			policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 				adapter->device_mode, adapter->session_id);
-			hdd_start_green_ap_state_mc(hdd_ctx,
+			hdd_green_ap_start_state_mc(hdd_ctx,
 						    adapter->device_mode, true);
 		}
 		memcpy(wrqu.ap_addr.sa_data, pCsrRoamInfo->pBssDesc->bssId,
@@ -1440,7 +1440,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 				adapter->device_mode, adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
@@ -2328,7 +2328,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 	if (!hdd_is_roam_sync_in_progress(pCsrRoamInfo)) {
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 				adapter->device_mode, adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 	}
 
@@ -3046,7 +3046,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 							hdd_ctx->hdd_psoc,
 							adapter->device_mode,
 							adapter->session_id);
-						hdd_start_green_ap_state_mc(
+						hdd_green_ap_start_state_mc(
 							hdd_ctx,
 							adapter->device_mode,
 							false);
@@ -3533,7 +3533,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 		if (eCSR_ROAM_RESULT_IBSS_STARTED == roamResult) {
 			policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 				adapter->device_mode, adapter->session_id);
-			hdd_start_green_ap_state_mc(hdd_ctx,
+			hdd_green_ap_start_state_mc(hdd_ctx,
 						    adapter->device_mode, true);
 		} else if (eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS == roamResult ||
 				eCSR_ROAM_RESULT_IBSS_COALESCED == roamResult) {

+ 4 - 4
core/hdd/src/wlan_hdd_hostapd.c

@@ -784,7 +784,7 @@ static int hdd_stop_bss_link(struct hdd_adapter *adapter)
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 					adapter->device_mode,
 					adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 		errno = (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY;
 	}
@@ -4984,7 +4984,7 @@ __iw_softap_stopbss(struct net_device *dev,
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 					     adapter->device_mode,
 					     adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 		ret = qdf_status_to_os_return(status);
 	}
@@ -8023,7 +8023,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 					adapter->device_mode,
 					adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    true);
 	}
 #ifdef DHCP_SERVER_OFFLOAD
@@ -8218,7 +8218,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						adapter->device_mode,
 						adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 		adapter->session.ap.beacon = NULL;
 		qdf_mem_free(old);

+ 13 - 13
core/hdd/src/wlan_hdd_main.c

@@ -313,13 +313,13 @@ void hdd_start_complete(int ret)
 }
 
 /**
- * hdd_check_green_ap_enable() - to check whether to enable green ap or not
+ * hdd_green_ap_check_enable() - to check whether to enable green ap or not
  * @hdd_ctx: hdd context
  * @enable_green_ap: 1 - enable green ap enabled, 0 - disbale green ap
  *
  * Return: 0 - success, < 0 - failure
  */
-static int hdd_check_green_ap_enable(struct hdd_context *hdd_ctx,
+static int hdd_green_ap_check_enable(struct hdd_context *hdd_ctx,
 				     bool *enable_green_ap)
 {
 	uint8_t num_sessions, mode;
@@ -348,7 +348,7 @@ static int hdd_check_green_ap_enable(struct hdd_context *hdd_ctx,
 	return 0;
 }
 
-int hdd_start_green_ap_state_mc(struct hdd_context *hdd_ctx,
+int hdd_green_ap_start_state_mc(struct hdd_context *hdd_ctx,
 				enum QDF_OPMODE mode, bool is_session_start)
 {
 	struct hdd_config *cfg;
@@ -387,7 +387,7 @@ int hdd_start_green_ap_state_mc(struct hdd_context *hdd_ctx,
 						    false);
 			wlan_green_ap_stop(hdd_ctx->hdd_pdev);
 		} else {
-			ret = hdd_check_green_ap_enable(hdd_ctx,
+			ret = hdd_green_ap_check_enable(hdd_ctx,
 							&enable_green_ap);
 			if (!ret) {
 				if (enable_green_ap) {
@@ -404,7 +404,7 @@ int hdd_start_green_ap_state_mc(struct hdd_context *hdd_ctx,
 	case QDF_SAP_MODE:
 	case QDF_P2P_GO_MODE:
 		if (is_session_start) {
-			ret = hdd_check_green_ap_enable(hdd_ctx,
+			ret = hdd_green_ap_check_enable(hdd_ctx,
 							&enable_green_ap);
 			if (!ret) {
 				if (enable_green_ap) {
@@ -1927,7 +1927,7 @@ static void hdd_update_ra_rate_limit(struct hdd_context *hdd_ctx,
 }
 #endif
 
-static int hdd_update_green_ap_config(struct hdd_context *hdd_ctx)
+static int hdd_green_ap_update_config(struct hdd_context *hdd_ctx)
 {
 	struct green_ap_user_cfg green_ap_cfg;
 	struct hdd_config *cfg = hdd_ctx->config;
@@ -1971,7 +1971,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 		}
 	}
 
-	ret = hdd_update_green_ap_config(hdd_ctx);
+	ret = hdd_green_ap_update_config(hdd_ctx);
 
 	ucfg_ipa_set_dp_handle(hdd_ctx->hdd_psoc,
 			       cds_get_context(QDF_MODULE_ID_SOC));
@@ -5106,7 +5106,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 			policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						adapter->device_mode,
 						adapter->session_id);
-			hdd_start_green_ap_state_mc(hdd_ctx,
+			hdd_green_ap_start_state_mc(hdd_ctx,
 						    adapter->device_mode,
 						    false);
 
@@ -5279,7 +5279,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 		hdd_deinit_tx_rx(adapter);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 				adapter->device_mode, adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 		if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) {
 			hdd_wmm_adapter_close(adapter);
@@ -11543,7 +11543,7 @@ void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 						ap_adapter->device_mode,
 						ap_adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, ap_adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, ap_adapter->device_mode,
 					    false);
 		hdd_debug("SAP Stop Success");
 	} else {
@@ -11613,7 +11613,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
 		policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 					ap_adapter->device_mode,
 					ap_adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, ap_adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, ap_adapter->device_mode,
 					    true);
 	}
 	mutex_unlock(&hdd_ctx->sap_lock);
@@ -13361,7 +13361,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 		clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 		policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
 			ap_adapter->device_mode, ap_adapter->session_id);
-		hdd_start_green_ap_state_mc(hdd_ctx, ap_adapter->device_mode,
+		hdd_green_ap_start_state_mc(hdd_ctx, ap_adapter->device_mode,
 					    false);
 		hdd_err("SAP Stop Success");
 
@@ -13398,7 +13398,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 			policy_mgr_incr_active_session(hdd_ctx->hdd_psoc,
 						ap_adapter->device_mode,
 						ap_adapter->session_id);
-			hdd_start_green_ap_state_mc(hdd_ctx,
+			hdd_green_ap_start_state_mc(hdd_ctx,
 						    ap_adapter->device_mode,
 						    true);
 		}