qcacld-3.0: (part-8)Replace enum device_mode to tQDF_ADAPTER_MODE

Instead of using two different enums for setting adapter mode,
combined them to make only one set of enum.

Change-Id: Ic3e7c2944d1b8d66042398c57eb307ab30223524
CRs-Fixed: 985273

core/hdd/src/wlan_hdd_p2p.c

@@ -229,9 +229,9 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx,
 	 */
 	schedule_delayed_work(&hdd_ctx->roc_req_work, 0);
 
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+	if ((QDF_STA_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 	    ) {
 		uint8_t sessionId = pAdapter->sessionId;
 		if (REMAIN_ON_CHANNEL_REQUEST ==
@@ -241,8 +241,8 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx,
 						  (SIR_MAC_MGMT_PROBE_REQ << 4),
 						  NULL, 0);
 		}
-	} else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
-		   (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+	} else if ((QDF_SAP_MODE == pAdapter->device_mode) ||
+		   (QDF_P2P_GO_MODE == pAdapter->device_mode)
 		   ) {
 		wlansap_de_register_mgmt_frame(
 #ifdef WLAN_FEATURE_MBSSID
@@ -327,16 +327,16 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter)
 		 * The remain on channel callback will make sure the remain_on_chan
 		 * expired event is sent.
 		 */
-		if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-		    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-		    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+		if ((QDF_STA_MODE == pAdapter->device_mode) ||
+		    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+		    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 		    ) {
 			sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX
 							     (pAdapter),
 				pAdapter->sessionId,
 				pRemainChanCtx->scan_id);
-		} else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode)
-			   || (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+		} else if ((QDF_SAP_MODE == pAdapter->device_mode)
+			   || (QDF_P2P_GO_MODE == pAdapter->device_mode)
 			   ) {
 			wlansap_cancel_remain_on_channel(
 #ifdef WLAN_FEATURE_MBSSID
@@ -368,7 +368,7 @@ int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter)
 	int status = 0;
 	hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter);
 
-	if (WLAN_HDD_P2P_GO != pAdapter->device_mode) {
+	if (QDF_P2P_GO_MODE != pAdapter->device_mode) {
 		/* Cancel Existing Remain On Channel */
 		/* If no action frame is pending */
 		if (cfgState->remain_on_chan_ctx != NULL) {
@@ -420,13 +420,13 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter)
 	}
 	mutex_unlock(&cfg_state->remain_on_chan_ctx_lock);
 
-	if (adapter->device_mode == WLAN_HDD_P2P_GO) {
+	if (adapter->device_mode == QDF_P2P_GO_MODE) {
 		wlansap_cancel_remain_on_channel((WLAN_HDD_GET_CTX
 					(adapter))->pcds_context,
 					cfg_state->remain_on_chan_ctx->scan_id);
-	} else if (adapter->device_mode == WLAN_HDD_P2P_CLIENT
+	} else if (adapter->device_mode == QDF_P2P_CLIENT_MODE
 			|| adapter->device_mode ==
-			WLAN_HDD_P2P_DEVICE) {
+			QDF_P2P_DEVICE_MODE) {
 		sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX
 				(adapter),
 				adapter->sessionId,
@@ -519,15 +519,15 @@ void wlan_hdd_remain_on_chan_timeout(void *data)
 	mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
 	hddLog(LOG1, "%s: Cancel Remain on Channel on timeout", __func__);
 
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+	if ((QDF_STA_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 	    ) {
 		sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX(pAdapter),
 			pAdapter->sessionId,
 			pRemainChanCtx->scan_id);
-	} else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
-		   (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+	} else if ((QDF_SAP_MODE == pAdapter->device_mode) ||
+		   (QDF_P2P_GO_MODE == pAdapter->device_mode)
 		   ) {
 		wlansap_cancel_remain_on_channel(
 			(WLAN_HDD_GET_CTX(pAdapter))->pcds_context,
@@ -583,9 +583,8 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 	status = hdd_get_front_adapter(pHddCtx, &pAdapterNode);
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		pAdapter_temp = pAdapterNode->pAdapter;
-		if (pAdapter_temp->device_mode == WLAN_HDD_P2P_GO) {
+		if (pAdapter_temp->device_mode == QDF_P2P_GO_MODE)
 			isGoPresent = true;
-		}
 		status = hdd_get_next_adapter(pHddCtx, pAdapterNode, &pNext);
 		pAdapterNode = pNext;
 	}
@@ -601,9 +600,9 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 	INIT_COMPLETION(pAdapter->rem_on_chan_ready_event);
 
 	/* call sme API to start remain on channel. */
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+	if ((QDF_STA_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 	    ) {
 		uint8_t sessionId = pAdapter->sessionId;
 		/* call sme API to start remain on channel. */
@@ -641,8 +640,8 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 					FL("sme_register_mgmt_frame failed"));
 		}
 
-	} else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
-		   (WLAN_HDD_P2P_GO == pAdapter->device_mode)) {
+	} else if ((QDF_SAP_MODE == pAdapter->device_mode) ||
+		   (QDF_P2P_GO_MODE == pAdapter->device_mode)) {
 		/* call sme API to start remain on channel. */
 		if (QDF_STATUS_SUCCESS != wlansap_remain_on_channel(
 #ifdef WLAN_FEATURE_MBSSID
@@ -870,7 +869,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy,
 	pRemainChanCtx->action_pkt_buff.frame_length = 0;
 	pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress = false;
 	if (REMAIN_ON_CHANNEL_REQUEST == request_type) {
-		sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION);
+		sta_adapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE);
 		if ((NULL != sta_adapter) &&
 			hdd_conn_is_connected(
 				WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter))) {
@@ -1178,17 +1177,17 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 	 * The remain on channel callback will make sure the remain_on_chan
 	 * expired event is sent.
 	 */
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+	if ((QDF_STA_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 	    ) {
 
 		uint8_t sessionId = pAdapter->sessionId;
 		sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX(pAdapter),
 			sessionId,
 			pRemainChanCtx->scan_id);
-	} else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
-		   (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+	} else if ((QDF_SAP_MODE == pAdapter->device_mode) ||
+		   (QDF_P2P_GO_MODE == pAdapter->device_mode)
 		   ) {
 		wlansap_cancel_remain_on_channel(
 #ifdef WLAN_FEATURE_MBSSID
@@ -1333,7 +1332,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 		mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
 	}
 
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
+	if ((QDF_STA_MODE == pAdapter->device_mode) &&
 		(type == SIR_MAC_MGMT_FRAME &&
 		subType == SIR_MAC_MGMT_PROBE_RSP)) {
 			/* Drop Probe response received
@@ -1345,8 +1344,8 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 	/* Call sme API to send out a action frame. */
 	/* OR can we send it directly through data path?? */
 	/* After tx completion send tx status back. */
-	if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+	if ((QDF_SAP_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_GO_MODE == pAdapter->device_mode)
 	    ) {
 		if (type == SIR_MAC_MGMT_FRAME) {
 			if (subType == SIR_MAC_MGMT_PROBE_RSP) {
@@ -1396,13 +1395,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 					     [WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET]));
 	}
 
-	if (pAdapter->device_mode == WLAN_HDD_SOFTAP) {
+	if (pAdapter->device_mode == QDF_SAP_MODE) {
 		home_ch = pAdapter->sessionCtx.ap.operatingChannel;
-	} else if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION) {
+	} else if (pAdapter->device_mode == QDF_STA_MODE) {
 		home_ch =
 			pAdapter->sessionCtx.station.conn_info.operationChannel;
 	} else {
-		goAdapter = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_P2P_GO);
+		goAdapter = hdd_get_adapter(pAdapter->pHddCtx, QDF_P2P_GO_MODE);
 		if (goAdapter)
 			home_ch = goAdapter->sessionCtx.ap.operatingChannel;
 	}
@@ -1544,9 +1543,9 @@ send_frame:
 	 * Firmware needs channel information for action frames
 	 * which are not sent on the current operating channel of VDEV
 	 */
-	if ((WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) ||
-		(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-		(WLAN_HDD_P2P_GO == pAdapter->device_mode)) {
+	if ((QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ||
+		(QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+		(QDF_P2P_GO_MODE == pAdapter->device_mode)) {
 		if (chan && (chan->center_freq != 0))
 			current_freq = chan->center_freq;
 		else
@@ -1557,9 +1556,9 @@ send_frame:
 
 	INIT_COMPLETION(pAdapter->tx_action_cnf_event);
 
-	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
-	    (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)
+	if ((QDF_STA_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
+	    (QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
 	    ) {
 		uint8_t sessionId = pAdapter->sessionId;
 
@@ -1591,8 +1590,8 @@ send_frame:
 				  "%s: sme_send_action returned fail", __func__);
 			goto err;
 		}
-	} else if (WLAN_HDD_SOFTAP == pAdapter->device_mode ||
-		   WLAN_HDD_P2P_GO == pAdapter->device_mode) {
+	} else if (QDF_SAP_MODE == pAdapter->device_mode ||
+		   QDF_P2P_GO_MODE == pAdapter->device_mode) {
 		if (QDF_STATUS_SUCCESS !=
 #ifdef WLAN_FEATURE_MBSSID
 		    wlansap_send_action(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter),
@@ -1930,19 +1929,19 @@ static uint8_t wlan_hdd_get_session_type(enum nl80211_iftype type)
 
 	switch (type) {
 	case NL80211_IFTYPE_AP:
-		sessionType = WLAN_HDD_SOFTAP;
+		sessionType = QDF_SAP_MODE;
 		break;
 	case NL80211_IFTYPE_P2P_GO:
-		sessionType = WLAN_HDD_P2P_GO;
+		sessionType = QDF_P2P_GO_MODE;
 		break;
 	case NL80211_IFTYPE_P2P_CLIENT:
-		sessionType = WLAN_HDD_P2P_CLIENT;
+		sessionType = QDF_P2P_CLIENT_MODE;
 		break;
 	case NL80211_IFTYPE_STATION:
-		sessionType = WLAN_HDD_INFRA_STATION;
+		sessionType = QDF_STA_MODE;
 		break;
 	default:
-		sessionType = WLAN_HDD_INFRA_STATION;
+		sessionType = QDF_STA_MODE;
 		break;
 	}
 
@@ -1987,18 +1986,18 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type));
 	/*
-	 * Allow addition multiple interfaces for WLAN_HDD_P2P_GO,
-	 * WLAN_HDD_SOFTAP, WLAN_HDD_P2P_CLIENT and WLAN_HDD_INFRA_STATION
+	 * Allow addition multiple interfaces for QDF_P2P_GO_MODE,
+	 * QDF_SAP_MODE, QDF_P2P_CLIENT_MODE and QDF_STA_MODE
 	 * session type.
 	 */
 	session_type = wlan_hdd_get_session_type(type);
 	if ((hdd_get_adapter(pHddCtx, session_type) != NULL)
 #ifdef WLAN_FEATURE_MBSSID
-	    && WLAN_HDD_SOFTAP != session_type
-	    && WLAN_HDD_P2P_GO != session_type
+	    && QDF_SAP_MODE != session_type
+	    && QDF_P2P_GO_MODE != session_type
 #endif
-	    && WLAN_HDD_P2P_CLIENT != session_type
-	    && WLAN_HDD_INFRA_STATION != session_type) {
+	    && QDF_P2P_CLIENT_MODE != session_type
+	    && QDF_STA_MODE != session_type) {
 		hddLog(LOGE,
 		       "%s: Interface type %d already exists. "
 		       "Two interfaces of same type are not supported currently.",
@@ -2008,7 +2007,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 
 	wlan_hdd_tdls_disable_offchan_and_teardown_links(pHddCtx);
 
-	pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION);
+	pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE);
 	if (pAdapter != NULL) {
 		scan_info = &pAdapter->scan_info;
 		if (scan_info->mScanPending) {

core/hdd/src/wlan_hdd_power.c

@@ -223,8 +223,8 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 	}
 
 	if ((pAdapter->dev == ndev) &&
-		(pAdapter->device_mode == WLAN_HDD_INFRA_STATION ||
-		pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
+		(pAdapter->device_mode == QDF_STA_MODE ||
+		pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
 		pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 		status = wlan_hdd_validate_context(pHddCtx);
 		if (0 != status)
@@ -294,8 +294,8 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable)
 	 * is controlled by one bit.
 	 */
 
-	if ((WLAN_HDD_SOFTAP == pAdapter->device_mode ||
-		WLAN_HDD_P2P_GO == pAdapter->device_mode) &&
+	if ((QDF_SAP_MODE == pAdapter->device_mode ||
+		QDF_P2P_GO_MODE == pAdapter->device_mode) &&
 		!pHddCtx->ap_arpns_support) {
 		hddLog(LOG1,
 			FL("NS Offload is not supported in SAP/P2PGO mode"));
@@ -496,8 +496,8 @@ void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, bool fenable)
 	/* Get the HDD context. */
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
-	if (((WLAN_HDD_INFRA_STATION != pAdapter->device_mode) &&
-	     (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode))) {
+	if (((QDF_STA_MODE != pAdapter->device_mode) &&
+	     (QDF_P2P_CLIENT_MODE != pAdapter->device_mode))) {
 		hdd_err("Offloads not supported in mode %d",
 			pAdapter->device_mode);
 		return;
@@ -618,8 +618,8 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
 	}
 
 	if ((pAdapter && pAdapter->dev == ndev) &&
-		(pAdapter->device_mode == WLAN_HDD_INFRA_STATION ||
-		pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
+		(pAdapter->device_mode == QDF_STA_MODE ||
+		pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
 
 		pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 		status = wlan_hdd_validate_context(pHddCtx);
@@ -698,8 +698,8 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 	/* In SAP/P2P Go mode, ARP/NS Offload feature capability
 	 * is controlled by one bit.
 	 */
-	if ((WLAN_HDD_SOFTAP == pAdapter->device_mode ||
-		WLAN_HDD_P2P_GO == pAdapter->device_mode) &&
+	if ((QDF_SAP_MODE == pAdapter->device_mode ||
+		QDF_P2P_GO_MODE == pAdapter->device_mode) &&
 		!pHddCtx->ap_arpns_support) {
 		hddLog(LOG1,
 			FL("ARP Offload is not supported in SAP/P2PGO mode"));
@@ -918,8 +918,8 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set)
 		/* Following pre-conditions should be satisfied before we
 		 * configure the MC address list.
 		 */
-		if (((pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-		     || (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT))
+		if (((pAdapter->device_mode == QDF_STA_MODE)
+		     || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE))
 		    && pAdapter->mc_addr_list.mc_cnt
 		    && (eConnectionState_Associated ==
 			(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->
@@ -1517,11 +1517,11 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	}
 
 	/* Try to get an adapter from mode ID */
-	pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION);
+	pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE);
 	if (!pAdapter) {
-		pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_SOFTAP);
+		pAdapter = hdd_get_adapter(pHddCtx, QDF_SAP_MODE);
 		if (!pAdapter) {
-			pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_IBSS);
+			pAdapter = hdd_get_adapter(pHddCtx, QDF_IBSS_MODE);
 			if (!pAdapter) {
 				hddLog(QDF_TRACE_LEVEL_FATAL,
 				       "%s: Failed to get Adapter!", __func__);
@@ -1689,8 +1689,8 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode)
 		 */
 		sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_DISABLE);
 	} else if (DRIVER_POWER_MODE_AUTO == mode) {
-		if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) ||
-				(WLAN_HDD_P2P_CLIENT == adapter->device_mode)) {
+		if ((QDF_STA_MODE == adapter->device_mode) ||
+				(QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
 			hddLog(LOG1, FL("Disabling Auto Power save timer"));
 			sme_ps_disable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX
 					(adapter),
@@ -1778,7 +1778,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		pAdapter = pAdapterNode->pAdapter;
 		if ((NULL != pAdapter) &&
-		    (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) {
+		    (QDF_STA_MODE == pAdapter->device_mode)) {
 			if (0 !=
 			    wlan_hdd_cfg80211_update_bss(pHddCtx->wiphy,
 							 pAdapter, 0)) {
@@ -1885,7 +1885,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	status = hdd_get_front_adapter(pHddCtx, &pAdapterNode);
 	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
 		pAdapter = pAdapterNode->pAdapter;
-		if (WLAN_HDD_SOFTAP == pAdapter->device_mode) {
+		if (QDF_SAP_MODE == pAdapter->device_mode) {
 			if (BSS_START ==
 			    WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter)->bssState &&
 			    true ==
@@ -1902,7 +1902,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 					FL("SAP does not support suspend!!"));
 				return -EOPNOTSUPP;
 			}
-		} else if (WLAN_HDD_P2P_GO == pAdapter->device_mode) {
+		} else if (QDF_P2P_GO_MODE == pAdapter->device_mode) {
 			if (!pHddCtx->config->enableSapSuspend) {
 				/* return -EOPNOTSUPP if GO does not support
 				 * suspend
@@ -2270,7 +2270,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 		return status;
 	}
 
-	pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION);
+	pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE);
 	if (NULL == pAdapter) {
 		hddLog(LOGE, FL("pAdapter is NULL"));
 		return -ENOENT;