qcacld-3.0: Fix clang warnings implicit enum type tAniBool

warning: implicit conversion from enumeration type 'tAniBool'
(aka 'enum eAniBool') to different enumeration type
'eSapBool' [-Wenum-conversion]

Replace tAniBool/eSapBool with bool.

Change-Id: I919488d2accc094049375fffe8b54a5d7dea621e
CRs-Fixed: 2055487
This commit is contained in:
Srinivas Girigowda
2017-06-21 23:28:25 -07:00
committed by snandini
parent 00c495d844
commit 74a66d627b
24 changed files with 76 additions and 88 deletions

View File

@@ -3448,7 +3448,7 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter,
hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (pRoamInfo->u.pMICFailureInfo->multicast == eSIR_TRUE)
if (pRoamInfo->u.pMICFailureInfo->multicast == true)
msg.flags = IW_MICFAILURE_GROUP;
else
msg.flags = IW_MICFAILURE_PAIRWISE;
@@ -3462,7 +3462,7 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter,
taMacAddr,
((pRoamInfo->u.pMICFailureInfo->
multicast ==
eSIR_TRUE) ?
true) ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE),
pRoamInfo->u.pMICFailureInfo->

View File

@@ -1496,7 +1496,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (pSapEvent->sapevt.sapStationMICFailureEvent.
multicast == eSAP_TRUE)
multicast == true)
msg.flags = IW_MICFAILURE_GROUP;
else
msg.flags = IW_MICFAILURE_PAIRWISE;
@@ -1513,7 +1513,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
((pSapEvent->sapevt.
sapStationMICFailureEvent.
multicast ==
eSAP_TRUE) ?
true) ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE),
pSapEvent->sapevt.

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -63,12 +63,6 @@
#define true 1
#endif
typedef enum eAniBool {
eSIR_FALSE,
eSIR_TRUE,
eSIR_DONOT_USE_BOOL = SIR_MAX_ENUM_SIZE
} tAniBool;
/* / Authentication type enum used with peer */
typedef enum eAniAuthType {
eSIR_OPEN_SYSTEM,
@@ -180,7 +174,7 @@ typedef struct sSirMicFailureInfo {
tSirMacAddr srcMacAddr; /* address used to compute MIC */
tSirMacAddr taMacAddr; /* transmitter address */
tSirMacAddr dstMacAddr;
tAniBool multicast;
bool multicast;
uint8_t IV1; /* first byte of IV */
uint8_t keyId; /* second byte of IV */
uint8_t TSC[SIR_CIPHER_SEQ_CTR_SIZE]; /* sequence number */

View File

@@ -1166,15 +1166,15 @@ typedef struct sSirSmeJoinReq {
tAniEdType MgmtEncryptionType;
#endif
tAniBool is11Rconnection;
bool is11Rconnection;
#ifdef FEATURE_WLAN_ESE
tAniBool isESEFeatureIniEnabled;
tAniBool isESEconnection;
bool isESEFeatureIniEnabled;
bool isESEconnection;
tESETspecInfo eseTspecInfo;
#endif
tAniBool isFastTransitionEnabled;
tAniBool isFastRoamIniFeatureEnabled;
bool isFastTransitionEnabled;
bool isFastRoamIniFeatureEnabled;
uint8_t txLdpcIniFeatureEnabled;
tSirHTConfig htConfig;
@@ -1190,11 +1190,11 @@ typedef struct sSirSmeJoinReq {
bool send_smps_action;
uint8_t max_amsdu_num;
tAniBool isWMEenabled;
tAniBool isQosEnabled;
tAniBool isOSENConnection;
bool isWMEenabled;
bool isQosEnabled;
bool isOSENConnection;
struct rrm_config_param rrm_config;
tAniBool spectrumMgtIndicator;
bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
bool enable_bcast_probe_rsp;
@@ -1310,11 +1310,11 @@ typedef struct sSirSmeAssocInd {
/* powerCap & supportedChannels are present only when */
/* spectrumMgtIndicator flag is set */
tAniBool spectrumMgtIndicator;
bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
tAniBool wmmEnabledSta; /* if present - STA is WMM enabled */
tAniBool reassocReq;
bool wmmEnabledSta; /* if present - STA is WMM enabled */
bool reassocReq;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;
uint8_t *beaconPtr;
@@ -1897,8 +1897,8 @@ typedef struct sAniChangeCountryCodeReq {
uint16_t msgType; /* message type is same as the request type */
uint16_t msgLen; /* length of the entire request */
uint8_t countryCode[WNI_CFG_COUNTRY_CODE_LEN]; /* 3 char country code */
tAniBool countryFromUserSpace;
tAniBool sendRegHint; /* true if we want to send hint to NL80211 */
bool countryFromUserSpace;
bool sendRegHint; /* true if we want to send hint to NL80211 */
void *changeCCCallback;
void *pDevContext; /* device context */
void *p_cds_context; /* cds context */

View File

@@ -292,14 +292,14 @@ typedef struct sPESession /* Added to Support BT-AMP */
int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */
enum tQDF_ADAPTER_MODE pePersona;
int8_t txMgmtPower;
tAniBool is11Rconnection;
bool is11Rconnection;
#ifdef FEATURE_WLAN_ESE
tAniBool isESEconnection;
bool isESEconnection;
tEsePEContext eseContext;
#endif
tAniBool isFastTransitionEnabled;
tAniBool isFastRoamIniFeatureEnabled;
bool isFastTransitionEnabled;
bool isFastRoamIniFeatureEnabled;
tSirNoAParam p2pNoA;
tSirP2PNoaAttr p2pGoPsUpdate;
uint32_t defaultAuthFailureTimeout;

View File

@@ -1354,34 +1354,34 @@ lim_update_overlap_sta_param(tpAniSirGlobal pMac, tSirMacAddr bssId,
* @param pBeacon - Parsed Beacon Frame structure
* @param pSession - Pointer to the PE session
*
* @return eSIR_TRUE if encryption type is matched; eSIR_FALSE otherwise
* @return true if encryption type is matched; false otherwise
*/
static tAniBool lim_ibss_enc_type_matched(tpSchBeaconStruct pBeacon,
static bool lim_ibss_enc_type_matched(tpSchBeaconStruct pBeacon,
tpPESession pSession)
{
if (!pBeacon || !pSession)
return eSIR_FALSE;
return false;
/* Open case */
if (pBeacon->capabilityInfo.privacy == 0
&& pSession->encryptType == eSIR_ED_NONE)
return eSIR_TRUE;
return true;
/* WEP case */
if (pBeacon->capabilityInfo.privacy == 1 && pBeacon->wpaPresent == 0
&& pBeacon->rsnPresent == 0
&& (pSession->encryptType == eSIR_ED_WEP40
|| pSession->encryptType == eSIR_ED_WEP104))
return eSIR_TRUE;
return true;
/* WPA-None case */
if (pBeacon->capabilityInfo.privacy == 1 && pBeacon->wpaPresent == 1
&& pBeacon->rsnPresent == 0
&& ((pSession->encryptType == eSIR_ED_CCMP) ||
(pSession->encryptType == eSIR_ED_TKIP)))
return eSIR_TRUE;
return true;
return eSIR_FALSE;
return false;
}
/**
@@ -1424,7 +1424,7 @@ lim_handle_ibss_coalescing(tpAniSirGlobal pMac,
lim_cmp_ssid(&pBeacon->ssId, psessionEntry) ||
(psessionEntry->currentOperChannel != pBeacon->channelNumber))
retCode = eSIR_LIM_IGNORE_BEACON;
else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != eSIR_TRUE) {
else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != true) {
pe_debug("peer privacy: %d peer wpa: %d peer rsn: %d self encType: %d",
pBeacon->capabilityInfo.privacy,
pBeacon->wpaPresent, pBeacon->rsnPresent,

View File

@@ -2192,7 +2192,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx,
/* Fill in 802.11h related info */
if (assoc_req->powerCapabilityPresent
&& assoc_req->supportedChannelsPresent) {
assoc_ind->spectrumMgtIndicator = eSIR_TRUE;
assoc_ind->spectrumMgtIndicator = true;
assoc_ind->powerCap.minTxPower =
assoc_req->powerCapability.minTxPower;
assoc_ind->powerCap.maxTxPower =
@@ -2200,7 +2200,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx,
lim_convert_supported_channels(mac_ctx, assoc_ind,
assoc_req);
} else {
assoc_ind->spectrumMgtIndicator = eSIR_FALSE;
assoc_ind->spectrumMgtIndicator = false;
}
/* This check is to avoid extra Sec IEs present incase of WPS */

View File

@@ -281,7 +281,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx,
if (sta_ds_ptr) {
tLimMlmDisassocReq *pMlmDisassocReq = NULL;
tLimMlmDeauthReq *pMlmDeauthReq = NULL;
tAniBool isConnected = eSIR_TRUE;
bool isConnected = true;
pMlmDisassocReq =
mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq;
@@ -294,7 +294,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx,
MAC_ADDR_ARRAY(
pMlmDisassocReq->peer_macaddr.bytes));
lim_process_disassoc_ack_timeout(mac_ctx);
isConnected = eSIR_FALSE;
isConnected = false;
}
pMlmDeauthReq =
mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq;
@@ -307,7 +307,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx,
MAC_ADDR_ARRAY(
pMlmDeauthReq->peer_macaddr.bytes));
lim_process_deauth_ack_timeout(mac_ctx);
isConnected = eSIR_FALSE;
isConnected = false;
}
/*

View File

@@ -878,7 +878,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, struct scheduler_msg *limMsg,
tpSirMacMgmtHdr pHdr = NULL;
tpPESession psessionEntry = NULL;
uint8_t sessionId;
tAniBool isFrmFt = false;
bool isFrmFt = false;
*pDeferMsg = false;
lim_get_b_dfrom_rx_packet(pMac, limMsg->bodyptr,

View File

@@ -756,7 +756,7 @@ lim_fill_assoc_ind_params(tpAniSirGlobal mac_ctx,
/* Copy the new TITAN capabilities */
sme_assoc_ind->spectrumMgtIndicator = assoc_ind->spectrumMgtIndicator;
if (assoc_ind->spectrumMgtIndicator == eSIR_TRUE) {
if (assoc_ind->spectrumMgtIndicator == true) {
sme_assoc_ind->powerCap.minTxPower =
assoc_ind->powerCap.minTxPower;
sme_assoc_ind->powerCap.maxTxPower =

View File

@@ -142,7 +142,7 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
LIM_BSS_CAPS_GET(WSM, pe_session->limReassocBssQosCaps);
if (pe_session->lim11hEnable &&
pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
pe_session->pLimReAssocReq->spectrumMgtIndicator == true) {
power_caps_populated = true;
populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps,
@@ -604,7 +604,7 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
LIM_BSS_CAPS_GET(WSM, psessionEntry->limReassocBssQosCaps);
if (psessionEntry->lim11hEnable &&
psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
psessionEntry->pLimReAssocReq->spectrumMgtIndicator == true) {
PowerCapsPopulated = true;
populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC,
psessionEntry);

View File

@@ -1716,7 +1716,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
LIM_BSS_CAPS_GET(WSM, pe_session->limCurrentBssQosCaps);
if (pe_session->lim11hEnable &&
pe_session->pLimJoinReq->spectrumMgtIndicator == eSIR_TRUE) {
pe_session->pLimJoinReq->spectrumMgtIndicator == true) {
power_caps = true;
populate_dot11f_power_caps(mac_ctx, &frm->PowerCaps,

View File

@@ -253,12 +253,12 @@ typedef struct sLimMlmAssocInd {
tSirWAPIie wapiIE;
tSirAddie addIE; /* additional IE received from the peer, which possibly includes WSC IE and/or P2P IE. */
tSirMacCapabilityInfo capabilityInfo;
tAniBool spectrumMgtIndicator;
bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
uint8_t sessionId;
tAniBool WmmStaInfoPresent;
bool WmmStaInfoPresent;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;
@@ -292,11 +292,11 @@ typedef struct sLimMlmReassocInd {
tSirWAPIie wapiIE;
tSirAddie addIE; /* additional IE received from the peer, which can be WSC IE and/or P2P IE. */
tSirMacCapabilityInfo capabilityInfo;
tAniBool spectrumMgtIndicator;
bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
tAniBool WmmStaInfoPresent;
bool WmmStaInfoPresent;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;

View File

@@ -4930,7 +4930,7 @@ void lim_resset_scan_channel_info(tpAniSirGlobal pMac)
* @param channel - New channel to which we are expected to move
* @return None
*/
tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t channel)
bool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t channel)
{
uint8_t index;
uint32_t validChannelListLen = WNI_CFG_VALID_CHANNEL_LIST_LEN;
@@ -4941,16 +4941,16 @@ tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t ch
(uint32_t *) &validChannelListLen) !=
eSIR_SUCCESS) {
pe_err("could not retrieve valid channel list");
return eSIR_FALSE;
return false;
}
for (index = 0; index < validChannelListLen; index++) {
if (validChannelList[index] == channel)
return eSIR_TRUE;
return true;
}
/* channel does not belong to list of valid channels */
return eSIR_FALSE;
return false;
}
/**------------------------------------------------------

View File

@@ -247,7 +247,7 @@ void lim_update_sta_run_time_ht_info(struct sAniSirGlobal *pMac,
void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac,
tpPESession psessionEntry);
void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry);
tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac,
bool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac,
uint8_t channel);
void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type,
tLimControlTx mode);

View File

@@ -201,12 +201,6 @@ typedef enum {
eSAP_USR_INITATED_DISASSOC
} eSapDisassocReason;
/*Handle bool over here*/
typedef enum {
eSAP_FALSE,
eSAP_TRUE,
} eSapBool;
typedef enum {
eSAP_DFS_NOL_CLEAR,
eSAP_DFS_NOL_RANDOMIZE,
@@ -313,7 +307,7 @@ typedef struct sap_StationMICFailureEvent_s {
struct qdf_mac_addr srcMacAddr; /* address used to compute MIC */
struct qdf_mac_addr staMac; /* taMacAddr transmitter address */
struct qdf_mac_addr dstMacAddr;
eSapBool multicast;
bool multicast;
uint8_t IV1; /* first byte of IV */
uint8_t keyId; /* second byte of IV */
uint8_t TSC[SIR_CIPHER_SEQ_CTR_SIZE]; /* sequence number */

View File

@@ -568,7 +568,7 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
* beacon template will be cleared by now. A new beacon template
* with no CSA IE will be sent to firmware.
*/
dfs_beacon_start_req = eSAP_TRUE;
dfs_beacon_start_req = true;
sap_ctx->pre_cac_complete = false;
*ret_status = sme_roam_start_beacon_req(hHal, sap_ctx->bssid,
dfs_beacon_start_req);

View File

@@ -587,7 +587,7 @@ static bool sap_chan_sel_init(tHalHandle halHandle,
if (pSpectCh == NULL) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"In %s, QDF_MALLOC_ERR", __func__);
return eSAP_FALSE;
return false;
}
/* Initialize the pointers in the DfsParams to the allocated memory */
@@ -658,12 +658,12 @@ static bool sap_chan_sel_init(tHalHandle halHandle,
if (true == chSafe) {
pSpectCh->chNum = *pChans;
pSpectCh->valid = eSAP_TRUE;
pSpectCh->valid = true;
pSpectCh->rssiAgr = SOFTAP_MIN_RSSI; /* Initialise for all channels */
pSpectCh->channelWidth = SOFTAP_HT20_CHANNELWIDTH; /* Initialise 20MHz for all the Channels */
}
}
return eSAP_TRUE;
return true;
}
/*==========================================================================
@@ -2084,12 +2084,12 @@ static void sap_sort_chl_weight_all(ptSapContext pSapCtx,
static bool sap_filter_over_lap_ch(ptSapContext pSapCtx, uint16_t chNum)
{
if (pSapCtx->enableOverLapCh)
return eSAP_TRUE;
return true;
else if ((chNum == CHANNEL_1) ||
(chNum == CHANNEL_6) || (chNum == CHANNEL_11))
return eSAP_TRUE;
return true;
return eSAP_FALSE;
return false;
}
#ifdef FEATURE_WLAN_CH_AVOID
@@ -2238,7 +2238,7 @@ uint8_t sap_select_channel(tHalHandle hal, ptSapContext sap_ctx,
}
/* Initialize the structure pointed by spect_info */
if (sap_chan_sel_init(hal, spect_info, sap_ctx) != eSAP_TRUE) {
if (sap_chan_sel_init(hal, spect_info, sap_ctx) != true) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("Ch Select initialization failed"));
return SAP_CHANNEL_NOT_SELECTED;

View File

@@ -3824,7 +3824,7 @@ void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size)
}
}
eSapBool
bool
sap_search_mac_list(struct qdf_mac_addr *macList,
uint8_t num_mac, uint8_t *peerMac,
uint8_t *index)
@@ -3836,7 +3836,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("either buffer is NULL or size = %d is more."), num_mac);
return eSAP_FALSE;
return false;
}
while (nStart <= nEnd) {
@@ -3856,7 +3856,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
QDF_TRACE_LEVEL_INFO_HIGH, "index %d",
*index);
}
return eSAP_TRUE;
return true;
}
if (nRes < 0)
nStart = nMiddle + 1;
@@ -3866,7 +3866,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"search not succ");
return eSAP_FALSE;
return false;
}
void sap_add_mac_to_acl(struct qdf_mac_addr *macList,
@@ -4088,9 +4088,9 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
* - DFS scan enabled and chan not in CHANNEL_STATE_DISABLE
* - DFS scan disable but chan in CHANNEL_STATE_ENABLE
*/
if (!(((eSAP_TRUE == mac_ctx->scan.fEnableDFSChnlScan) &&
if (!(((true == mac_ctx->scan.fEnableDFSChnlScan) &&
wlan_reg_get_channel_state(mac_ctx->pdev, loop_count)) ||
((eSAP_FALSE == mac_ctx->scan.fEnableDFSChnlScan) &&
((false == mac_ctx->scan.fEnableDFSChnlScan) &&
(CHANNEL_STATE_ENABLE ==
wlan_reg_get_channel_state(mac_ctx->pdev, loop_count)))))
continue;
@@ -4199,7 +4199,7 @@ uint8_t sap_indicate_radar(ptSapContext sap_ctx)
* if the radar is found in the STARTED state
*/
if (eSAP_STARTED == sap_ctx->sapsMachine)
mac->sap.SapDfsInfo.csaIERequired = eSAP_TRUE;
mac->sap.SapDfsInfo.csaIERequired = true;
if (sap_ctx->csr_roamProfile.disableDFSChSwitch)
return sap_ctx->channel;

View File

@@ -368,7 +368,7 @@ sap_remove_mac_from_acl(struct qdf_mac_addr *macList, uint8_t *size,
void
sap_print_acl(struct qdf_mac_addr *macList, uint8_t size);
eSapBool
bool
sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac,
uint8_t *peerMac, uint8_t *index);

View File

@@ -1300,7 +1300,7 @@ QDF_STATUS
wlansap_modify_acl
(void *ctx,
uint8_t *peer_sta_mac, eSapACLType list_type, eSapACLCmdType cmd) {
eSapBool sta_white_list = eSAP_FALSE, sta_black_list = eSAP_FALSE;
bool sta_white_list = false, sta_black_list = false;
uint8_t staWLIndex, staBLIndex;
ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx);

View File

@@ -443,8 +443,8 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal,
uint8_t *pCountry,
void *pContext,
void *p_cds_context,
tAniBool countryFromUserSpace,
tAniBool sendRegHint);
bool countryFromUserSpace,
bool sendRegHint);
QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
uint8_t *pCountry);
QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal,

View File

@@ -5059,8 +5059,8 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal,
uint8_t *pCountry,
void *pContext,
void *p_cds_context,
tAniBool countryFromUserSpace,
tAniBool sendRegHint)
bool countryFromUserSpace,
bool sendRegHint)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);

View File

@@ -14046,7 +14046,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
uint8_t txBFCsnValue = 0;
tSirSmeJoinReq *csr_join_req;
tSirMacCapabilityInfo *pAP_capabilityInfo;
tAniBool fTmp;
bool fTmp;
int8_t pwrLimit = 0;
struct ps_global_info *ps_global_info = &pMac->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[sessionId];
@@ -14656,9 +14656,9 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
*/
if (csr_is11h_supported(pMac) && pAP_capabilityInfo->spectrumMgt
&& eSIR_11A_NW_TYPE == pBssDescription->nwType) {
fTmp = (tAniBool) 1;
fTmp = true;
} else
fTmp = (tAniBool) 0;
fTmp = false;
csr_join_req->spectrumMgtIndicator = fTmp;
csr_join_req->powerCap.minTxPower = MIN_TX_PWR_CAP;