A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Change-Id: Ia98c4406992c1065850dc70ab3b33c49216d0a24
CRs-Fixed: 985273
This commit is contained in:
Krunal Soni 2016-03-10 13:07:10 -08:00 • committed by Gerrit - the friendly Code Review server
commit 056ea0ffde
1 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

86
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -388,7 +388,7 @@ QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter,
hddLog(LOGE, FL("change HT20/40 mode"));
if (WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode) {
if (QDF_SAP_MODE == pHostapdAdapter->device_mode) {
hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
if (NULL == hHal) {
hddLog(LOGE, FL("Hal ctx is null"));
@ -1140,9 +1140,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
}
if (pHddCtx->config->conc_custom_rule2 &&
(WLAN_HDD_P2P_GO == pHostapdAdapter->device_mode)) {
(QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) {
hdd_adapter_t *sta_adapter = hdd_get_adapter(pHddCtx,
WLAN_HDD_INFRA_STATION);
QDF_STA_MODE);
hddLog(LOG2,
FL("P2PGO is going down now"));
hdd_issue_stored_joinreq(sta_adapter, pHddCtx);
@ -1431,7 +1431,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
hdd_abort_mac_scan(pHddCtx, pHostapdAdapter->sessionId,
eCSR_SCAN_ABORT_DEFAULT);
}
if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) {
if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
/* send peer status indication to oem app */
hdd_send_peer_status_ind_to_oem_app(&pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
@ -1551,7 +1551,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
hddLog(LOGE, FL("failed to update Beacon interval %d"),
qdf_status);
}
if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) {
if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
/* send peer status indication to oem app */
hdd_send_peer_status_ind_to_oem_app(&pSapEvent->sapevt.
sapStationDisassocCompleteEvent.
@ -1715,7 +1715,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
/* Indicate operating channel change to hostapd
* only for non driver override acs
*/
if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP &&
if (pHostapdAdapter->device_mode == QDF_SAP_MODE &&
pHddCtx->config->force_sap_acs)
return QDF_STATUS_SUCCESS;
else
@ -2033,7 +2033,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel,
return ret;
}
sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION);
sta_adapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE);
/*
* conc_custom_rule1:
* Force SCC for SAP + STA
@ -2432,8 +2432,8 @@ static __iw_softap_setparam(struct net_device *dev,
break;
case QCSAP_PARAM_SET_CHANNEL_CHANGE:
if ((WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode) ||
(WLAN_HDD_P2P_GO == pHostapdAdapter->device_mode)) {
if ((QDF_SAP_MODE == pHostapdAdapter->device_mode) ||
(QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) {
hddLog(LOG1,
"SET Channel Change to new channel= %d",
set_value);
@ -2855,7 +2855,7 @@ static __iw_softap_setparam(struct net_device *dev,
{
hddLog(LOG1, "Set Dfs ignore CAC %d", set_value);
if (pHostapdAdapter->device_mode != WLAN_HDD_SOFTAP)
if (pHostapdAdapter->device_mode != QDF_SAP_MODE)
return -EINVAL;
ret = wlansap_set_dfs_ignore_cac(hHal, set_value);
@ -2866,7 +2866,7 @@ static __iw_softap_setparam(struct net_device *dev,
{
hddLog(LOG1, "Set Dfs target channel %d", set_value);
if (pHostapdAdapter->device_mode != WLAN_HDD_SOFTAP)
if (pHostapdAdapter->device_mode != QDF_SAP_MODE)
return -EINVAL;
ret = wlansap_set_dfs_target_chnl(hHal, set_value);
@ -6061,9 +6061,9 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter)
pAdapter->sessionCtx.ap.sapContext = sapContext;
if (pAdapter->device_mode == WLAN_HDD_P2P_GO) {
if (pAdapter->device_mode == QDF_P2P_GO_MODE) {
mode = QDF_P2P_GO_MODE;
} else if (pAdapter->device_mode == WLAN_HDD_SOFTAP) {
} else if (pAdapter->device_mode == QDF_SAP_MODE) {
mode = QDF_SAP_MODE;
} else {
hdd_err("Invalid mode for AP: %d", pAdapter->device_mode);
@ -6473,8 +6473,8 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy,
num_ch = WNI_CFG_VALID_CHANNEL_LIST_LEN;
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 (QDF_STATUS_SUCCESS !=
wlan_hdd_validate_operation_channel(pAdapter, channel)) {
hddLog(LOGE, FL("Invalid Channel [%d]"), channel);
@ -6487,8 +6487,8 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy,
pAdapter->device_mode);
}
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)
) {
hdd_wext_state_t *pWextState =
WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@ -6508,11 +6508,11 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy,
pHddStaCtx->conn_info.operationChannel = channel;
pRoamProfile->ChannelInfo.ChannelList =
&pHddStaCtx->conn_info.operationChannel;
} else if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
} else if ((pAdapter->device_mode == QDF_SAP_MODE)
|| (pAdapter->device_mode == QDF_P2P_GO_MODE)
) {
sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig);
if (WLAN_HDD_P2P_GO == pAdapter->device_mode) {
if (QDF_P2P_GO_MODE == pAdapter->device_mode) {
if (QDF_STATUS_SUCCESS !=
wlan_hdd_validate_operation_channel(pAdapter,
channel)) {
@ -6948,14 +6948,14 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter)
#endif
#ifdef FEATURE_WLAN_WAPI
if (WLAN_HDD_SOFTAP == adapter->device_mode) {
if (QDF_SAP_MODE == adapter->device_mode) {
wlan_hdd_add_extra_ie(adapter, genie, &total_ielen,
WLAN_EID_WAPI);
}
#endif
if (adapter->device_mode == WLAN_HDD_SOFTAP ||
adapter->device_mode == WLAN_HDD_P2P_GO)
if (adapter->device_mode == QDF_SAP_MODE ||
adapter->device_mode == QDF_P2P_GO_MODE)
wlan_hdd_add_hostapd_conf_vsie(adapter, genie,
&total_ielen);
@ -6967,7 +6967,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter)
}
#ifdef QCA_HT_2040_COEX
if (WLAN_HDD_SOFTAP == adapter->device_mode) {
if (QDF_SAP_MODE == adapter->device_mode) {
tSmeConfigParams smeConfig;
qdf_mem_zero(&smeConfig, sizeof(smeConfig));
sme_get_config_param(WLAN_HDD_GET_HAL_CTX(adapter),
@ -7258,7 +7258,7 @@ int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
tHalHandle h_hal = WLAN_HDD_GET_HAL_CTX(ap_adapter);
if (ap_adapter->device_mode == WLAN_HDD_SOFTAP &&
if (ap_adapter->device_mode == QDF_SAP_MODE &&
hdd_ctx->config->force_sap_acs)
goto setup_acs_overrides;
@ -7437,7 +7437,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
hddLog(LOG2, FL("****pConfig->dtim_period=%d***"),
pConfig->dtim_period);
if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) {
if (pHostapdAdapter->device_mode == QDF_SAP_MODE) {
pIe =
wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail,
pBeacon->tail_len,
@ -7489,7 +7489,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
wlan_sap_set_channel_avoidance(hHal,
iniConfig->sap_channel_avoidance);
#endif
} else if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) {
} else if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
pConfig->countryCode[0] = pHddCtx->reg.alpha2[0];
pConfig->countryCode[1] = pHddCtx->reg.alpha2[1];
pConfig->ieee80211d = 0;
@ -7677,7 +7677,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
*/
if ((0 == pHddCtx->config->conc_custom_rule1) ||
(pHddCtx->config->conc_custom_rule1 &&
WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode))
QDF_SAP_MODE == pHostapdAdapter->device_mode))
pConfig->cc_switch_mode = iniConfig->WlanMccToSccSwitchMode;
#endif
@ -7792,7 +7792,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
/* Enable OBSS protection */
pConfig->obssProtEnabled = iniConfig->apOBSSProtEnabled;
if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP)
if (pHostapdAdapter->device_mode == QDF_SAP_MODE)
pConfig->sap_dot11mc =
(WLAN_HDD_GET_CTX(pHostapdAdapter))->config->sap_dot11mc;
else /* for P2P-Go case */
@ -7830,7 +7830,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
}
if (!cds_allow_concurrency(
cds_convert_device_mode_to_hdd_type(
cds_convert_device_mode_to_qdf_type(
pHostapdAdapter->device_mode),
pConfig->channel, HW_MODE_20_MHZ)) {
hddLog(LOGW,
@ -7898,7 +7898,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
#endif /* DHCP_SERVER_OFFLOAD */
#ifdef WLAN_FEATURE_P2P_DEBUG
if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) {
if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
if (global_p2p_connection_status == P2P_GO_NEG_COMPLETED) {
global_p2p_connection_status = P2P_GO_COMPLETED_STATE;
hddLog(LOGE,
@ -7957,8 +7957,8 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
if (0 != ret)
return ret;
if (!(pAdapter->device_mode == WLAN_HDD_SOFTAP ||
pAdapter->device_mode == WLAN_HDD_P2P_GO)) {
if (!(pAdapter->device_mode == QDF_SAP_MODE ||
pAdapter->device_mode == QDF_P2P_GO_MODE)) {
return -EOPNOTSUPP;
}
@ -7970,9 +7970,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
staAdapter = pAdapterNode->pAdapter;
if (WLAN_HDD_INFRA_STATION == staAdapter->device_mode ||
(WLAN_HDD_P2P_CLIENT == staAdapter->device_mode) ||
(WLAN_HDD_P2P_GO == staAdapter->device_mode)) {
if (QDF_STA_MODE == staAdapter->device_mode ||
(QDF_P2P_CLIENT_MODE == staAdapter->device_mode) ||
(QDF_P2P_GO_MODE == staAdapter->device_mode)) {
pScanInfo = &staAdapter->scan_info;
if (pScanInfo && pScanInfo->mScanPending) {
@ -8003,7 +8003,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
* then lets finish it and go ahead from there.
*/
if (pHddCtx->config->conc_custom_rule1 &&
(WLAN_HDD_SOFTAP == pAdapter->device_mode)) {
(QDF_SAP_MODE == pAdapter->device_mode)) {
cds_flush_work(&pHddCtx->sap_start_work);
hddLog(LOGW, FL("Canceled the pending restart work"));
spin_lock(&pHddCtx->sap_update_info_lock);
@ -8085,7 +8085,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
wlan_hdd_reset_prob_rspies(pAdapter);
#ifdef WLAN_FEATURE_P2P_DEBUG
if ((pAdapter->device_mode == WLAN_HDD_P2P_GO) &&
if ((pAdapter->device_mode == QDF_P2P_GO_MODE) &&
(global_p2p_connection_status == P2P_GO_COMPLETED_STATE)) {
hddLog(LOGE,
"[P2P State] From GO completed to Inactive state GO got removed");
@ -8200,7 +8200,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
/* check if concurrency is allowed */
if (!cds_allow_concurrency(
cds_convert_device_mode_to_hdd_type(
cds_convert_device_mode_to_qdf_type(
pAdapter->device_mode),
channel,
channel_width)) {
@ -8229,8 +8229,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
}
}
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
if ((pAdapter->device_mode == QDF_SAP_MODE)
|| (pAdapter->device_mode == QDF_P2P_GO_MODE)
) {
beacon_data_t *old, *new;
enum nl80211_channel_type channel_type;
@ -8347,8 +8347,8 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
if (0 != status)
return status;
if (!(pAdapter->device_mode == WLAN_HDD_SOFTAP ||
pAdapter->device_mode == WLAN_HDD_P2P_GO)) {
if (!(pAdapter->device_mode == QDF_SAP_MODE ||
pAdapter->device_mode == QDF_P2P_GO_MODE)) {
return -EOPNOTSUPP;
}