Browse Source

qcacld-3.0: Rename legacy isMcThreadSuspended to is_scheduler_suspended

Rename legacy isMcThreadSuspended to is_scheduler_suspended as MC thread
terminology is obsolete and scheduler is common name for new control
path scheduling entity.

Change-Id: I21ec90855e794ad6bea154d7b7b86417a564cac3
CRs-Fixed: 1101514
Rajeev Kumar 8 years ago
parent
commit
eada0d05db
3 changed files with 12 additions and 13 deletions
  1. 1 1
      core/hdd/inc/wlan_hdd_main.h
  2. 2 2
      core/hdd/src/wlan_hdd_main.c
  3. 9 10
      core/hdd/src/wlan_hdd_power.c

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

@@ -1328,7 +1328,7 @@ struct hdd_context_s {
 	/* Completion  variable to indicate Mc Thread Suspended */
 	struct completion mc_sus_event_var;
 
-	bool isMcThreadSuspended;
+	bool is_scheduler_suspended;
 
 #ifdef QCA_CONFIG_SMP
 	bool is_ol_rx_thread_suspended;

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

@@ -7954,8 +7954,8 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size)
 	len += scnprintf(buf + len, *size - len,
 		"\n isWiphySuspended %d", hdd_ctx->isWiphySuspended);
 	len += scnprintf(buf + len, *size - len,
-		"\n isMcThreadSuspended %d",
-		hdd_ctx->isMcThreadSuspended);
+		"\n is_scheduler_suspended %d",
+		hdd_ctx->is_scheduler_suspended);
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapter_node);
 

+ 9 - 10
core/hdd/src/wlan_hdd_power.c

@@ -1478,10 +1478,9 @@ QDF_STATUS hdd_wlan_shutdown(void)
 
 	cds_sched_context = get_cds_sched_ctxt();
 
-	/* Wakeup all driver threads */
-	if (true == pHddCtx->isMcThreadSuspended) {
+	if (pHddCtx->is_scheduler_suspended) {
 		scheduler_resume_complete();
-		pHddCtx->isMcThreadSuspended = false;
+		pHddCtx->is_scheduler_suspended = false;
 	}
 #ifdef QCA_CONFIG_SMP
 	if (true == pHddCtx->is_ol_rx_thread_suspended) {
@@ -1756,10 +1755,10 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	mutex_unlock(&pHddCtx->iface_change_lock);
 	pld_request_bus_bandwidth(pHddCtx->parent_dev, PLD_BUS_WIDTH_MEDIUM);
 
-	/* Resume MC thread */
-	if (pHddCtx->isMcThreadSuspended) {
+	/* Resume control path scheduler */
+	if (pHddCtx->is_scheduler_suspended) {
 		scheduler_resume_complete();
-		pHddCtx->isMcThreadSuspended = false;
+		pHddCtx->is_scheduler_suspended = false;
 	}
 #ifdef QCA_CONFIG_SMP
 	/* Resume tlshim Rx thread */
@@ -2017,12 +2016,12 @@ next_adapter:
 		goto resume_tx;
 	}
 
-	/* Suspend MC thread */
+	/* Suspend control path scheduler */
 	scheduler_register_hdd_suspend_callback(hdd_suspend_cb);
 	scheduler_set_event_mask(MC_SUSPEND_EVENT_MASK);
 	scheduler_wake_up_controller_thread();
 
-	/* Wait for suspend confirmation from MC thread */
+	/* Wait for suspend confirmation from scheduler */
 	rc = wait_for_completion_timeout(&pHddCtx->mc_sus_event_var,
 		msecs_to_jiffies(WLAN_WAIT_TIME_MCTHREAD_SUSPEND));
 	if (!rc) {
@@ -2031,7 +2030,7 @@ next_adapter:
 		goto resume_tx;
 	}
 
-	pHddCtx->isMcThreadSuspended = true;
+	pHddCtx->is_scheduler_suspended = true;
 
 #ifdef QCA_CONFIG_SMP
 	/* Suspend tlshim rx thread */
@@ -2063,7 +2062,7 @@ next_adapter:
 resume_all:
 
 	scheduler_resume_complete();
-	pHddCtx->isMcThreadSuspended = false;
+	pHddCtx->is_scheduler_suspended = false;
 #endif
 
 resume_tx: