mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-07 05:53:06 +00:00
rtl8188eu: Change _FALSE and _TRUE to false and true
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
3d0ee1321a
commit
9cef34aa09
69 changed files with 2493 additions and 3604 deletions
282
core/rtw_mlme.c
282
core/rtw_mlme.c
|
|
@ -200,7 +200,7 @@ _func_enter_;
|
|||
|
||||
_enter_critical_bh(&queue->lock, &irqL);
|
||||
|
||||
if (_rtw_queue_empty(queue) == _TRUE)
|
||||
if (_rtw_queue_empty(queue) == true)
|
||||
|
||||
pnetwork = NULL;
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ _func_enter_;
|
|||
|
||||
_enter_critical_bh(&free_queue->lock, &irqL);
|
||||
|
||||
if (_rtw_queue_empty(free_queue) == _TRUE) {
|
||||
if (_rtw_queue_empty(free_queue) == true) {
|
||||
pnetwork=NULL;
|
||||
goto exit;
|
||||
}
|
||||
|
|
@ -241,7 +241,7 @@ _func_enter_;
|
|||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist));
|
||||
pnetwork->network_type = 0;
|
||||
pnetwork->fixed = _FALSE;
|
||||
pnetwork->fixed = false;
|
||||
pnetwork->last_scanned = rtw_get_current_time();
|
||||
pnetwork->aid=0;
|
||||
pnetwork->join_res=0;
|
||||
|
|
@ -268,13 +268,13 @@ _func_enter_;
|
|||
if (pnetwork == NULL)
|
||||
goto exit;
|
||||
|
||||
if (pnetwork->fixed == _TRUE)
|
||||
if (pnetwork->fixed == true)
|
||||
goto exit;
|
||||
|
||||
curr_time = rtw_get_current_time();
|
||||
|
||||
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) ||
|
||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) )
|
||||
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) ||
|
||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) )
|
||||
lifetime = 1;
|
||||
|
||||
if (!isfreeall)
|
||||
|
|
@ -342,7 +342,7 @@ _func_enter_;
|
|||
if (pnetwork == NULL)
|
||||
goto exit;
|
||||
|
||||
if (pnetwork->fixed == _TRUE)
|
||||
if (pnetwork->fixed == true)
|
||||
goto exit;
|
||||
|
||||
//_enter_critical(&free_queue->lock, &irqL);
|
||||
|
|
@ -391,7 +391,7 @@ _func_enter_;
|
|||
{
|
||||
pnetwork = LIST_CONTAINOR(plist, struct wlan_network ,list);
|
||||
|
||||
if (_rtw_memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE)
|
||||
if (_rtw_memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN) == true)
|
||||
break;
|
||||
|
||||
plist = get_next(plist);
|
||||
|
|
@ -427,7 +427,7 @@ _func_enter_;
|
|||
phead = get_list_head(scanned_queue);
|
||||
plist = get_next(phead);
|
||||
|
||||
while (rtw_end_of_queue_search(phead, plist) == _FALSE)
|
||||
while (rtw_end_of_queue_search(phead, plist) == false)
|
||||
{
|
||||
|
||||
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
|
||||
|
|
@ -453,12 +453,12 @@ sint rtw_if_up(_adapter *padapter) {
|
|||
_func_enter_;
|
||||
|
||||
if ( padapter->bDriverStopped || padapter->bSurpriseRemoved ||
|
||||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _FALSE)){
|
||||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== false)){
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
|
||||
res=_FALSE;
|
||||
res=false;
|
||||
}
|
||||
else
|
||||
res= _TRUE;
|
||||
res= true;
|
||||
|
||||
_func_exit_;
|
||||
return res;
|
||||
|
|
@ -597,22 +597,22 @@ struct wlan_network *rtw_find_network(_queue *scanned_queue, u8 *addr)
|
|||
|
||||
int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork)
|
||||
{
|
||||
int ret=_TRUE;
|
||||
int ret=true;
|
||||
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
||||
|
||||
if ( (psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ ) &&
|
||||
( pnetwork->network.Privacy == 0 ) )
|
||||
{
|
||||
ret=_FALSE;
|
||||
ret=false;
|
||||
}
|
||||
else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_ ) &&
|
||||
( pnetwork->network.Privacy == 1 ) )
|
||||
{
|
||||
ret=_FALSE;
|
||||
ret=false;
|
||||
}
|
||||
else
|
||||
{
|
||||
ret=_TRUE;
|
||||
ret=true;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
@ -625,7 +625,7 @@ inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b)
|
|||
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(%s,%d)(%s,%d)\n",
|
||||
// a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength));
|
||||
return (a->Ssid.SsidLength == b->Ssid.SsidLength)
|
||||
&& _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==_TRUE;
|
||||
&& _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==true;
|
||||
}
|
||||
|
||||
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst)
|
||||
|
|
@ -644,7 +644,7 @@ _func_enter_;
|
|||
|
||||
KeBugCheckEx(0x87110000, (ULONG_PTR)dst, (ULONG_PTR)src,(ULONG_PTR)&s_cap, (ULONG_PTR)&d_cap);
|
||||
|
||||
return _FALSE;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -660,8 +660,8 @@ _func_exit_;
|
|||
|
||||
return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
|
||||
// (src->Configuration.DSConfig == dst->Configuration.DSConfig) &&
|
||||
( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) &&
|
||||
( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) &&
|
||||
( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) &&
|
||||
( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) &&
|
||||
((s_cap & WLAN_CAPABILITY_IBSS) ==
|
||||
(d_cap & WLAN_CAPABILITY_IBSS)) &&
|
||||
((s_cap & WLAN_CAPABILITY_BSS) ==
|
||||
|
|
@ -684,12 +684,12 @@ _func_enter_;
|
|||
while (1)
|
||||
{
|
||||
|
||||
if (rtw_end_of_queue_search(phead,plist)== _TRUE)
|
||||
if (rtw_end_of_queue_search(phead,plist)== true)
|
||||
break;
|
||||
|
||||
pwlan= LIST_CONTAINOR(plist, struct wlan_network, list);
|
||||
|
||||
if (pwlan->fixed!=_TRUE)
|
||||
if (pwlan->fixed!=true)
|
||||
{
|
||||
if (oldest == NULL ||time_after(oldest->last_scanned, pwlan->last_scanned))
|
||||
oldest = pwlan;
|
||||
|
|
@ -790,9 +790,9 @@ _func_enter_;
|
|||
}
|
||||
#endif
|
||||
|
||||
if ( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork)))
|
||||
if ( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork)))
|
||||
{
|
||||
update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, _TRUE);
|
||||
update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, true);
|
||||
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
|
||||
pmlmepriv->cur_network.network.IELength);
|
||||
}
|
||||
|
|
@ -820,7 +820,7 @@ _func_enter_;
|
|||
|
||||
while (1)
|
||||
{
|
||||
if (rtw_end_of_queue_search(phead,plist)== _TRUE)
|
||||
if (rtw_end_of_queue_search(phead,plist)== true)
|
||||
break;
|
||||
|
||||
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
|
||||
|
|
@ -846,9 +846,9 @@ _func_enter_;
|
|||
|
||||
/* If we didn't find a match, then get a new network slot to initialize
|
||||
* with this beacon's information */
|
||||
if (rtw_end_of_queue_search(phead,plist)== _TRUE) {
|
||||
if (rtw_end_of_queue_search(phead,plist)== true) {
|
||||
|
||||
if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == _TRUE) {
|
||||
if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == true) {
|
||||
/* If there are no more slots, expire the oldest */
|
||||
//list_del_init(&oldest->list);
|
||||
pnetwork = oldest;
|
||||
|
|
@ -860,7 +860,7 @@ _func_enter_;
|
|||
_rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
|
||||
//pnetwork->last_scanned = rtw_get_current_time();
|
||||
// variable initialize
|
||||
pnetwork->fixed = _FALSE;
|
||||
pnetwork->fixed = false;
|
||||
pnetwork->last_scanned = rtw_get_current_time();
|
||||
|
||||
pnetwork->network_type = 0;
|
||||
|
|
@ -904,13 +904,13 @@ _func_enter_;
|
|||
* be already expired. In this case we do the same as we found a new
|
||||
* net and call the new_net handler
|
||||
*/
|
||||
bool update_ie = _TRUE;
|
||||
bool update_ie = true;
|
||||
|
||||
pnetwork->last_scanned = rtw_get_current_time();
|
||||
|
||||
//target.Reserved[0]==1, means that scaned network is a bcn frame.
|
||||
if ((pnetwork->network.IELength>target->IELength) && (target->Reserved[0]==1))
|
||||
update_ie = _FALSE;
|
||||
update_ie = false;
|
||||
|
||||
update_network(&(pnetwork->network), target,adapter, update_ie);
|
||||
}
|
||||
|
|
@ -962,7 +962,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
|
|||
//u8 wps_ie[512];
|
||||
uint wps_ielen;
|
||||
|
||||
int bselected = _TRUE;
|
||||
int bselected = true;
|
||||
|
||||
desired_encmode = psecuritypriv->ndisencryptstatus;
|
||||
privacy = pnetwork->network.Privacy;
|
||||
|
|
@ -971,29 +971,29 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
|
|||
{
|
||||
if (rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen)!=NULL)
|
||||
{
|
||||
return _TRUE;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return _FALSE;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (adapter->registrypriv.wifi_spec == 1) //for correct flow of 8021X to do....
|
||||
{
|
||||
if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0))
|
||||
bselected = _FALSE;
|
||||
bselected = false;
|
||||
}
|
||||
|
||||
|
||||
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
|
||||
DBG_88E("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
|
||||
bselected = _FALSE;
|
||||
bselected = false;
|
||||
}
|
||||
|
||||
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)
|
||||
{
|
||||
if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode)
|
||||
bselected = _FALSE;
|
||||
bselected = false;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1054,7 +1054,7 @@ _func_enter_;
|
|||
_enter_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
// update IBSS_network 's timestamp
|
||||
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE)
|
||||
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true)
|
||||
{
|
||||
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE\n\n");
|
||||
if (_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN))
|
||||
|
|
@ -1076,7 +1076,7 @@ _func_enter_;
|
|||
}
|
||||
|
||||
// lock pmlmepriv->lock when you accessing network_q
|
||||
if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE)
|
||||
if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == false)
|
||||
{
|
||||
if ( pnetwork->Ssid.Ssid[0] == 0 )
|
||||
{
|
||||
|
|
@ -1138,11 +1138,11 @@ _func_enter_;
|
|||
rtw_set_signal_stat_timer(&adapter->recvpriv);
|
||||
#endif
|
||||
|
||||
if (pmlmepriv->to_join == _TRUE)
|
||||
if (pmlmepriv->to_join == true)
|
||||
{
|
||||
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE) )
|
||||
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true) )
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED)==_FALSE)
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED)==false)
|
||||
{
|
||||
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
|
||||
|
||||
|
|
@ -1173,7 +1173,7 @@ _func_enter_;
|
|||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error=>rtw_createbss_cmd status FAIL\n"));
|
||||
}
|
||||
|
||||
pmlmepriv->to_join = _FALSE;
|
||||
pmlmepriv->to_join = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1181,7 +1181,7 @@ _func_enter_;
|
|||
{
|
||||
int s_ret;
|
||||
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
|
||||
pmlmepriv->to_join = _FALSE;
|
||||
pmlmepriv->to_join = false;
|
||||
if (_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv)))
|
||||
{
|
||||
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
|
||||
|
|
@ -1208,7 +1208,7 @@ _func_enter_;
|
|||
rtw_free_assoc_resources(adapter, 1);
|
||||
rtw_indicate_disconnect(adapter);
|
||||
} else {
|
||||
pmlmepriv->to_join = _TRUE;
|
||||
pmlmepriv->to_join = true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1223,7 +1223,7 @@ _func_enter_;
|
|||
_exit_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
#ifdef CONFIG_P2P_PS
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
|
||||
p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0);
|
||||
}
|
||||
#endif // CONFIG_P2P_PS
|
||||
|
|
@ -1363,7 +1363,7 @@ _func_enter_;
|
|||
pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
|
||||
if (pwlan)
|
||||
{
|
||||
pwlan->fixed = _FALSE;
|
||||
pwlan->fixed = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1398,7 +1398,7 @@ _func_enter_;
|
|||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n"));
|
||||
|
||||
pmlmepriv->to_join = _FALSE;
|
||||
pmlmepriv->to_join = false;
|
||||
|
||||
if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED))
|
||||
{
|
||||
|
|
@ -1499,7 +1499,7 @@ _func_enter_;
|
|||
|
||||
#ifdef CONFIG_LPS
|
||||
#ifdef CONFIG_WOWLAN
|
||||
if (padapter->pwrctrlpriv.wowlan_mode==_FALSE)
|
||||
if (padapter->pwrctrlpriv.wowlan_mode==false)
|
||||
#endif //CONFIG_WOWLAN
|
||||
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
|
||||
#endif
|
||||
|
|
@ -1520,7 +1520,7 @@ void rtw_scan_abort(_adapter *adapter)
|
|||
struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
|
||||
|
||||
start = rtw_get_current_time();
|
||||
pmlmeext->scan_abort = _TRUE;
|
||||
pmlmeext->scan_abort = true;
|
||||
while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
|
||||
&& rtw_get_passing_time_ms(start) <= 200) {
|
||||
|
||||
|
|
@ -1539,9 +1539,9 @@ void rtw_scan_abort(_adapter *adapter)
|
|||
set_survey_timer(pmlmeext, 0);
|
||||
_set_timer(&pmlmepriv->scan_to_timer, 50);
|
||||
#endif
|
||||
rtw_indicate_scan_done(adapter, _TRUE);
|
||||
rtw_indicate_scan_done(adapter, true);
|
||||
}
|
||||
pmlmeext->scan_abort = _FALSE;
|
||||
pmlmeext->scan_abort = false;
|
||||
}
|
||||
|
||||
static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wlan_network *pnetwork)
|
||||
|
|
@ -1572,16 +1572,16 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
|
|||
#endif
|
||||
|
||||
//sta mode
|
||||
rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE);
|
||||
rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,true);
|
||||
|
||||
//security related
|
||||
if (padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X)
|
||||
{
|
||||
padapter->securitypriv.binstallGrpkey=_FALSE;
|
||||
padapter->securitypriv.busetkipkey=_FALSE;
|
||||
padapter->securitypriv.bgrpkey_handshake=_FALSE;
|
||||
padapter->securitypriv.binstallGrpkey=false;
|
||||
padapter->securitypriv.busetkipkey=false;
|
||||
padapter->securitypriv.bgrpkey_handshake=false;
|
||||
|
||||
psta->ieee8021x_blocked=_TRUE;
|
||||
psta->ieee8021x_blocked=true;
|
||||
psta->dot118021XPrivacy=padapter->securitypriv.dot11PrivacyAlgrthm;
|
||||
|
||||
_rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof (union Keytype));
|
||||
|
|
@ -1598,7 +1598,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
|
|||
// And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted.
|
||||
if ( padapter->securitypriv.wps_ie_len != 0 )
|
||||
{
|
||||
psta->ieee8021x_blocked=_TRUE;
|
||||
psta->ieee8021x_blocked=true;
|
||||
padapter->securitypriv.wps_ie_len = 0;
|
||||
}
|
||||
|
||||
|
|
@ -1610,7 +1610,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
|
|||
{
|
||||
//preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
|
||||
preorder_ctrl = &psta->recvreorder_ctrl[i];
|
||||
preorder_ctrl->enable = _FALSE;
|
||||
preorder_ctrl->enable = false;
|
||||
preorder_ctrl->indicate_seq = 0xffff;
|
||||
#ifdef DBG_RX_SEQ
|
||||
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
|
||||
|
|
@ -1628,7 +1628,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
|
|||
{
|
||||
//preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
|
||||
preorder_ctrl = &bmc_sta->recvreorder_ctrl[i];
|
||||
preorder_ctrl->enable = _FALSE;
|
||||
preorder_ctrl->enable = false;
|
||||
preorder_ctrl->indicate_seq = 0xffff;
|
||||
#ifdef DBG_RX_SEQ
|
||||
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
|
||||
|
|
@ -1740,7 +1740,7 @@ void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
|
|||
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
|
||||
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
|
||||
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
|
||||
unsigned int the_same_macaddr = _FALSE;
|
||||
unsigned int the_same_macaddr = false;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1801,14 +1801,14 @@ _func_enter_;
|
|||
//s1. find ptarget_wlan
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) )
|
||||
{
|
||||
if (the_same_macaddr == _TRUE)
|
||||
if (the_same_macaddr == true)
|
||||
{
|
||||
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
|
||||
}
|
||||
else
|
||||
{
|
||||
pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
|
||||
if (pcur_wlan) pcur_wlan->fixed = _FALSE;
|
||||
if (pcur_wlan) pcur_wlan->fixed = false;
|
||||
|
||||
pcur_sta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress);
|
||||
if (pcur_sta){
|
||||
|
|
@ -1818,8 +1818,8 @@ _func_enter_;
|
|||
}
|
||||
|
||||
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = _TRUE;
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1827,8 +1827,8 @@ _func_enter_;
|
|||
else
|
||||
{
|
||||
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = _TRUE;
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1846,7 +1846,7 @@ _func_enter_;
|
|||
|
||||
|
||||
//s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
|
||||
{
|
||||
ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);
|
||||
if (ptarget_sta==NULL)
|
||||
|
|
@ -1858,7 +1858,7 @@ _func_enter_;
|
|||
}
|
||||
|
||||
//s4. indicate connect
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
|
||||
{
|
||||
rtw_indicate_connect(adapter);
|
||||
}
|
||||
|
|
@ -1892,7 +1892,7 @@ _func_enter_;
|
|||
|
||||
//rtw_free_assoc_resources(adapter, 1);
|
||||
|
||||
if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _TRUE)
|
||||
if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == true)
|
||||
{
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", get_fwstate(pmlmepriv)));
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
|
||||
|
|
@ -2032,7 +2032,7 @@ void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf)
|
|||
|
||||
_func_enter_;
|
||||
|
||||
if (rtw_access_ctrl(adapter, pstassoc->macaddr) == _FALSE)
|
||||
if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
|
||||
return;
|
||||
|
||||
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
|
||||
|
|
@ -2107,7 +2107,7 @@ _func_enter_;
|
|||
//psta->aid = (uint)pstassoc->cam_id;
|
||||
DBG_88E("%s\n",__func__);
|
||||
//for ad-hoc mode
|
||||
rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE);
|
||||
rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,true);
|
||||
|
||||
rtw_stassoc_hw_rpt(adapter,psta);
|
||||
|
||||
|
|
@ -2115,18 +2115,18 @@ _func_enter_;
|
|||
psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm;
|
||||
|
||||
|
||||
psta->ieee8021x_blocked = _FALSE;
|
||||
psta->ieee8021x_blocked = false;
|
||||
|
||||
_enter_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) ||
|
||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) )
|
||||
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) ||
|
||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) )
|
||||
{
|
||||
if (adapter->stapriv.asoc_sta_count== 2)
|
||||
{
|
||||
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = _TRUE;
|
||||
if (ptarget_wlan) ptarget_wlan->fixed = true;
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
// a sta + bc/mc_stainfo (not Ibss_stainfo)
|
||||
rtw_indicate_connect(adapter);
|
||||
|
|
@ -2140,7 +2140,7 @@ _func_enter_;
|
|||
|
||||
#ifdef CONFIG_RTL8711
|
||||
//submit SetStaKey_cmd to tell fw, fw will allocate an CAM entry for this sta
|
||||
rtw_setstakey_cmd(adapter, (unsigned char*)psta, _FALSE);
|
||||
rtw_setstakey_cmd(adapter, (unsigned char*)psta, false);
|
||||
#endif
|
||||
|
||||
exit:
|
||||
|
|
@ -2218,7 +2218,7 @@ _func_enter_;
|
|||
// remove the network entry in scanned_queue
|
||||
pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
|
||||
if (pwlan) {
|
||||
pwlan->fixed = _FALSE;
|
||||
pwlan->fixed = false;
|
||||
rtw_free_network_nolock(pmlmepriv, pwlan);
|
||||
}
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
|
|
@ -2245,7 +2245,7 @@ _func_enter_;
|
|||
pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
|
||||
if (pwlan)
|
||||
{
|
||||
pwlan->fixed = _FALSE;
|
||||
pwlan->fixed = false;
|
||||
rtw_free_network_nolock(pmlmepriv, pwlan);
|
||||
}
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
|
|
@ -2402,7 +2402,7 @@ void rtw_scan_timeout_handler (_adapter *adapter)
|
|||
|
||||
_exit_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
rtw_indicate_scan_done(adapter, _TRUE);
|
||||
rtw_indicate_scan_done(adapter, true);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2418,13 +2418,13 @@ static void rtw_auto_scan_handler(_adapter *padapter)
|
|||
if (pmlmepriv->scan_interval==0)
|
||||
{
|
||||
/*
|
||||
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
|
||||
{
|
||||
DBG_88E("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
if (pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE)
|
||||
if (pmlmepriv->sitesurveyctrl.traffic_busy == true)
|
||||
{
|
||||
DBG_88E("%s exit cause traffic_busy(%x)\n",__func__, pmlmepriv->sitesurveyctrl.traffic_busy);
|
||||
return;
|
||||
|
|
@ -2434,8 +2434,8 @@ static void rtw_auto_scan_handler(_adapter *padapter)
|
|||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if (rtw_buddy_adapter_up(padapter))
|
||||
{
|
||||
if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) ||
|
||||
(padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE))
|
||||
if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
|
||||
(padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == true))
|
||||
{
|
||||
DBG_88E("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __func__);
|
||||
return;
|
||||
|
|
@ -2471,24 +2471,24 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
|
|||
if (adapter->HalFunc.hal_checke_bt_hang)
|
||||
adapter->HalFunc.hal_checke_bt_hang(adapter);
|
||||
#endif
|
||||
if (adapter->hw_init_completed == _FALSE)
|
||||
if (adapter->hw_init_completed == false)
|
||||
return;
|
||||
|
||||
if ((adapter->bDriverStopped == _TRUE)||(adapter->bSurpriseRemoved== _TRUE))
|
||||
if ((adapter->bDriverStopped == true)||(adapter->bSurpriseRemoved== true))
|
||||
return;
|
||||
|
||||
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if (pbuddy_adapter)
|
||||
{
|
||||
if (adapter->net_closed == _TRUE && pbuddy_adapter->net_closed == _TRUE)
|
||||
if (adapter->net_closed == true && pbuddy_adapter->net_closed == true)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif //CONFIG_CONCURRENT_MODE
|
||||
if (adapter->net_closed == _TRUE)
|
||||
if (adapter->net_closed == true)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -2509,7 +2509,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
|
|||
|
||||
#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
|
||||
#ifdef CONFIG_AP_MODE
|
||||
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
|
||||
{
|
||||
expire_timeout_chk(adapter);
|
||||
}
|
||||
|
|
@ -2527,7 +2527,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
|
|||
#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
|
||||
if ( rcu_dereference(adapter->pnetdev->rx_handler_data)
|
||||
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
|
||||
&& (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
|
||||
&& (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) )
|
||||
{
|
||||
// expire NAT2.5 entry
|
||||
void nat25_db_expire(_adapter *priv);
|
||||
|
|
@ -2556,7 +2556,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
|
|||
inline bool rtw_is_scan_deny(_adapter *adapter)
|
||||
{
|
||||
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
|
||||
return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE;
|
||||
return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? true : false;
|
||||
}
|
||||
|
||||
inline void rtw_clear_scan_deny(_adapter *adapter)
|
||||
|
|
@ -2607,37 +2607,37 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
|
|||
#ifndef PLATFORM_FREEBSD
|
||||
/*
|
||||
* Select a new join candidate from the original @param candidate and @param competitor
|
||||
* @return _TRUE: candidate is updated
|
||||
* @return _FALSE: candidate is not updated
|
||||
* @return true: candidate is updated
|
||||
* @return false: candidate is not updated
|
||||
*/
|
||||
static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
|
||||
, struct wlan_network **candidate, struct wlan_network *competitor)
|
||||
{
|
||||
int updated = _FALSE;
|
||||
int updated = false;
|
||||
_adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv);
|
||||
|
||||
|
||||
//check bssid, if needed
|
||||
if (pmlmepriv->assoc_by_bssid==_TRUE) {
|
||||
if (_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==_FALSE)
|
||||
if (pmlmepriv->assoc_by_bssid==true) {
|
||||
if (_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==false)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
//check ssid, if needed
|
||||
if (pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) {
|
||||
if ( competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength
|
||||
|| _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == _FALSE
|
||||
|| _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false
|
||||
)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if (rtw_is_desired_network(adapter, competitor) == _FALSE)
|
||||
if (rtw_is_desired_network(adapter, competitor) == false)
|
||||
goto exit;
|
||||
|
||||
#ifdef CONFIG_LAYER2_ROAMING
|
||||
if (pmlmepriv->to_roaming) {
|
||||
if ( rtw_get_passing_time_ms((u32)competitor->last_scanned) >= RTW_SCAN_RESULT_EXPIRE
|
||||
|| is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == _FALSE
|
||||
|| is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == false
|
||||
)
|
||||
goto exit;
|
||||
}
|
||||
|
|
@ -2646,7 +2646,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
|
|||
if (*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
|
||||
{
|
||||
*candidate = competitor;
|
||||
updated = _TRUE;
|
||||
updated = true;
|
||||
}
|
||||
if (updated){
|
||||
DBG_88E("[by_bssid:%u][assoc_ssid:%s]"
|
||||
|
|
@ -2685,7 +2685,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
|
|||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *candidate = NULL;
|
||||
u8 bSupportAntDiv = _FALSE;
|
||||
u8 bSupportAntDiv = false;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -2725,12 +2725,12 @@ _func_enter_;
|
|||
|
||||
|
||||
// check for situation of _FW_LINKED
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
||||
{
|
||||
DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
|
||||
|
||||
{
|
||||
rtw_disassoc_cmd(adapter, 0, _TRUE);
|
||||
rtw_disassoc_cmd(adapter, 0, true);
|
||||
rtw_indicate_disconnect(adapter);
|
||||
rtw_free_assoc_resources(adapter, 0);
|
||||
}
|
||||
|
|
@ -2738,7 +2738,7 @@ _func_enter_;
|
|||
|
||||
#ifdef CONFIG_ANTENNA_DIVERSITY
|
||||
rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv));
|
||||
if (_TRUE == bSupportAntDiv)
|
||||
if (true == bSupportAntDiv)
|
||||
{
|
||||
u8 CurrentAntenna;
|
||||
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
|
||||
|
|
@ -2797,13 +2797,13 @@ _func_enter_;
|
|||
|
||||
pmlmepriv->pscanned = get_next(pmlmepriv->pscanned);
|
||||
|
||||
if (pmlmepriv->assoc_by_bssid==_TRUE)
|
||||
if (pmlmepriv->assoc_by_bssid==true)
|
||||
{
|
||||
if (_rtw_memcmp(pnetwork->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==_TRUE)
|
||||
if (_rtw_memcmp(pnetwork->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==true)
|
||||
{
|
||||
//remove the condition @ 20081125
|
||||
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
||||
{
|
||||
if (is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network))
|
||||
{
|
||||
|
|
@ -2813,7 +2813,7 @@ _func_enter_;
|
|||
}
|
||||
else
|
||||
{
|
||||
rtw_disassoc_cmd(adapter, 0, _TRUE);
|
||||
rtw_disassoc_cmd(adapter, 0, true);
|
||||
rtw_indicate_disconnect(adapter);
|
||||
rtw_free_assoc_resources(adapter, 0);
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
|
|
@ -2852,7 +2852,7 @@ _func_enter_;
|
|||
#endif
|
||||
|
||||
} else if ( (pnetwork->network.Ssid.SsidLength==pmlmepriv->assoc_ssid.SsidLength)
|
||||
&&((_rtw_memcmp(dst_ssid, src_ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE)
|
||||
&&((_rtw_memcmp(dst_ssid, src_ssid, pmlmepriv->assoc_ssid.SsidLength)) == true)
|
||||
)
|
||||
{
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s\n", dst_ssid, src_ssid));
|
||||
|
|
@ -2870,16 +2870,16 @@ _func_enter_;
|
|||
// goto ask_for_joinbss;
|
||||
//}
|
||||
|
||||
if (pmlmepriv->assoc_by_rssi==_TRUE)//if the ssid is the same, select the bss which has the max rssi
|
||||
if (pmlmepriv->assoc_by_rssi==true)//if the ssid is the same, select the bss which has the max rssi
|
||||
{
|
||||
if ( NULL==pnetwork_max_rssi|| pnetwork->network.Rssi > pnetwork_max_rssi->network.Rssi)
|
||||
pnetwork_max_rssi = pnetwork;
|
||||
}
|
||||
else if (rtw_is_desired_network(adapter, pnetwork) == _TRUE)
|
||||
else if (rtw_is_desired_network(adapter, pnetwork) == true)
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
||||
{
|
||||
rtw_disassoc_cmd(adapter, 0, _TRUE);
|
||||
rtw_disassoc_cmd(adapter, 0, true);
|
||||
rtw_free_assoc_resources(adapter, 0);
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
goto ask_for_joinbss;
|
||||
|
|
@ -2904,7 +2904,7 @@ _func_enter_;
|
|||
}
|
||||
#endif
|
||||
|
||||
if ((pmlmepriv->assoc_by_rssi==_TRUE) && (pnetwork_max_rssi!=NULL))
|
||||
if ((pmlmepriv->assoc_by_rssi==true) && (pnetwork_max_rssi!=NULL))
|
||||
{
|
||||
pnetwork = pnetwork_max_rssi;
|
||||
DBG_88E("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n",
|
||||
|
|
@ -3013,7 +3013,7 @@ _func_enter_;
|
|||
psetkeyparm->set_tx = set_tx;
|
||||
pmlmepriv->key_mask |= BIT(psetkeyparm->keyid);
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
if ( _TRUE == adapter->pwrctrlpriv.bInternalAutoSuspend)
|
||||
if ( true == adapter->pwrctrlpriv.bInternalAutoSuspend)
|
||||
{
|
||||
adapter->pwrctrlpriv.wepkeymask = pmlmepriv->key_mask;
|
||||
DBG_88E("....AutoSuspend pwrctrlpriv.wepkeymask(%x)\n",adapter->pwrctrlpriv.wepkeymask);
|
||||
|
|
@ -3132,7 +3132,7 @@ static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
|
|||
do
|
||||
{
|
||||
if ( ( psecuritypriv->PMKIDList[i].bUsed ) &&
|
||||
( _rtw_memcmp( psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN ) == _TRUE ) )
|
||||
( _rtw_memcmp( psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN ) == true ) )
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -3369,7 +3369,7 @@ void rtw_joinbss_reset(_adapter *padapter)
|
|||
|
||||
pmlmepriv->num_sta_no_ht = 0;
|
||||
|
||||
phtpriv->ampdu_enable = _FALSE;//reset to disabled
|
||||
phtpriv->ampdu_enable = false;//reset to disabled
|
||||
|
||||
#ifdef CONFIG_USB_HCI
|
||||
// TH=1 => means that invalidate usb rx aggregation
|
||||
|
|
@ -3409,7 +3409,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
|
|||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
|
||||
phtpriv->ht_option = _FALSE;
|
||||
phtpriv->ht_option = false;
|
||||
|
||||
p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12);
|
||||
|
||||
|
|
@ -3472,7 +3472,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
|
|||
//*pout_len = *pout_len + (ielen+2);
|
||||
|
||||
|
||||
phtpriv->ht_option = _TRUE;
|
||||
phtpriv->ht_option = true;
|
||||
|
||||
p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
|
||||
if (p && (ielen==sizeof(struct ieee80211_ht_addt_info)))
|
||||
|
|
@ -3514,20 +3514,20 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
|
|||
DBG_88E("+rtw_update_ht_cap()\n");
|
||||
|
||||
//maybe needs check if ap supports rx ampdu.
|
||||
if ((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1))
|
||||
if ((phtpriv->ampdu_enable==false) &&(pregistrypriv->ampdu_enable==1))
|
||||
{
|
||||
if (pregistrypriv->wifi_spec==1)
|
||||
{
|
||||
phtpriv->ampdu_enable = _FALSE;
|
||||
phtpriv->ampdu_enable = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
phtpriv->ampdu_enable = _TRUE;
|
||||
phtpriv->ampdu_enable = true;
|
||||
}
|
||||
}
|
||||
else if (pregistrypriv->ampdu_enable==2)
|
||||
{
|
||||
phtpriv->ampdu_enable = _TRUE;
|
||||
phtpriv->ampdu_enable = true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -3657,7 +3657,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
|
|||
|
||||
phtpriv = &psta->htpriv;
|
||||
|
||||
if ((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE))
|
||||
if ((phtpriv->ht_option==true) && (phtpriv->ampdu_enable==true))
|
||||
{
|
||||
issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;
|
||||
issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
|
||||
|
|
@ -3702,7 +3702,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
|
|||
pnetwork->network.Ssid.SsidLength);
|
||||
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
|
||||
|
||||
pmlmepriv->assoc_by_bssid = _FALSE;
|
||||
pmlmepriv->assoc_by_bssid = false;
|
||||
|
||||
#ifdef CONFIG_WAPI_SUPPORT
|
||||
rtw_wapi_return_all_sta_info(padapter);
|
||||
|
|
@ -3732,7 +3732,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
|
|||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
sint rtw_buddy_adapter_up(_adapter *padapter)
|
||||
{
|
||||
sint res = _FALSE;
|
||||
sint res = false;
|
||||
|
||||
if (padapter == NULL)
|
||||
return res;
|
||||
|
|
@ -3740,16 +3740,16 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
|
|||
|
||||
if (padapter->pbuddy_adapter == NULL)
|
||||
{
|
||||
res = _FALSE;
|
||||
res = false;
|
||||
}
|
||||
else if ( (padapter->pbuddy_adapter->bDriverStopped) || (padapter->pbuddy_adapter->bSurpriseRemoved) ||
|
||||
(padapter->pbuddy_adapter->bup == _FALSE) || (padapter->pbuddy_adapter->hw_init_completed == _FALSE))
|
||||
(padapter->pbuddy_adapter->bup == false) || (padapter->pbuddy_adapter->hw_init_completed == false))
|
||||
{
|
||||
res = _FALSE;
|
||||
res = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
res = _TRUE;
|
||||
res = true;
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
@ -3759,34 +3759,34 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
|
|||
sint check_buddy_fwstate(_adapter *padapter, sint state)
|
||||
{
|
||||
if (padapter == NULL)
|
||||
return _FALSE;
|
||||
return false;
|
||||
|
||||
if (padapter->pbuddy_adapter == NULL)
|
||||
return _FALSE;
|
||||
return false;
|
||||
|
||||
if ((state == WIFI_FW_NULL_STATE) &&
|
||||
(padapter->pbuddy_adapter->mlmepriv.fw_state == WIFI_FW_NULL_STATE))
|
||||
return _TRUE;
|
||||
return true;
|
||||
|
||||
if (padapter->pbuddy_adapter->mlmepriv.fw_state & state)
|
||||
return _TRUE;
|
||||
return true;
|
||||
|
||||
return _FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
sint check_buddy_fw_link(_adapter *padapter)
|
||||
{
|
||||
if ( (check_buddy_fwstate(padapter, WIFI_AP_STATE) == _TRUE) ||
|
||||
(check_buddy_fwstate(padapter, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE))
|
||||
if ( (check_buddy_fwstate(padapter, WIFI_AP_STATE) == true) ||
|
||||
(check_buddy_fwstate(padapter, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true))
|
||||
{
|
||||
if (padapter->pbuddy_adapter->stapriv.asoc_sta_count > 2)
|
||||
return _TRUE;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{ //Station mode
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED)== _TRUE)
|
||||
return _TRUE;
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED)== true)
|
||||
return true;
|
||||
}
|
||||
return _FALSE;
|
||||
return false;
|
||||
}
|
||||
#endif //CONFIG_CONCURRENT_MODE
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue