mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-19 11:33:05 +00:00
Change "if(" to "if (" and the same changes for "while", "for", "switch" and "do"
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
124abebb96
commit
a55f866a62
105 changed files with 6893 additions and 6893 deletions
|
|
@ -78,7 +78,7 @@ int cckrates_included(unsigned char *rate, int ratelen)
|
|||
{
|
||||
int i;
|
||||
|
||||
for(i = 0; i < ratelen; i++)
|
||||
for (i = 0; i < ratelen; i++)
|
||||
{
|
||||
if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
|
||||
(((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) )
|
||||
|
|
@ -93,7 +93,7 @@ int cckratesonly_included(unsigned char *rate, int ratelen)
|
|||
{
|
||||
int i;
|
||||
|
||||
for(i = 0; i < ratelen; i++)
|
||||
for (i = 0; i < ratelen; i++)
|
||||
{
|
||||
if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
|
||||
(((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) )
|
||||
|
|
@ -107,7 +107,7 @@ unsigned char networktype_to_raid(unsigned char network_type)
|
|||
{
|
||||
unsigned char raid;
|
||||
|
||||
switch(network_type)
|
||||
switch (network_type)
|
||||
{
|
||||
case WIRELESS_11B:
|
||||
raid = RATR_INX_WIRELESS_B;
|
||||
|
|
@ -147,7 +147,7 @@ u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen)
|
|||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
|
||||
if(pmlmeext->cur_channel > 14)
|
||||
if (pmlmeext->cur_channel > 14)
|
||||
{
|
||||
if (pmlmeinfo->HT_enable)
|
||||
{
|
||||
|
|
@ -167,7 +167,7 @@ u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen)
|
|||
{
|
||||
network_type |= WIRELESS_11B;
|
||||
}
|
||||
else if((cckrates_included(rate, ratelen)) == _TRUE)
|
||||
else if ((cckrates_included(rate, ratelen)) == _TRUE)
|
||||
{
|
||||
network_type |= WIRELESS_11BG;
|
||||
}
|
||||
|
|
@ -248,7 +248,7 @@ int is_basicrate(_adapter *padapter, unsigned char rate)
|
|||
unsigned char val;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
|
||||
for(i = 0; i < NumRates; i++)
|
||||
for (i = 0; i < NumRates; i++)
|
||||
{
|
||||
val = pmlmeext->basicrate[i];
|
||||
|
||||
|
|
@ -318,10 +318,10 @@ void UpdateBrateTbl(
|
|||
u8 rate;
|
||||
|
||||
// 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory.
|
||||
for(i=0;i<NDIS_802_11_LENGTH_RATES_EX;i++)
|
||||
for (i=0;i<NDIS_802_11_LENGTH_RATES_EX;i++)
|
||||
{
|
||||
rate = mBratesOS[i] & 0x7f;
|
||||
switch(rate)
|
||||
switch (rate)
|
||||
{
|
||||
case IEEE80211_CCK_RATE_1MB:
|
||||
case IEEE80211_CCK_RATE_2MB:
|
||||
|
|
@ -342,10 +342,10 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
|
|||
u8 i;
|
||||
u8 rate;
|
||||
|
||||
for(i=0;i<bssratelen;i++)
|
||||
for (i=0;i<bssratelen;i++)
|
||||
{
|
||||
rate = bssrateset[i] & 0x7f;
|
||||
switch(rate)
|
||||
switch (rate)
|
||||
{
|
||||
case IEEE80211_CCK_RATE_1MB:
|
||||
case IEEE80211_CCK_RATE_2MB:
|
||||
|
|
@ -364,7 +364,7 @@ void Save_DM_Func_Flag(_adapter *padapter)
|
|||
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
|
||||
if(pbuddy_adapter)
|
||||
if (pbuddy_adapter)
|
||||
rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
|
||||
#endif
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ void Restore_DM_Func_Flag(_adapter *padapter)
|
|||
u8 bSaveFlag = _FALSE;
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
|
||||
if(pbuddy_adapter)
|
||||
if (pbuddy_adapter)
|
||||
rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
|
||||
#endif
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
|
||||
|
|
@ -389,10 +389,10 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
|
|||
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
|
||||
#endif
|
||||
|
||||
if(enable == _TRUE)
|
||||
if (enable == _TRUE)
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(pbuddy_adapter)
|
||||
if (pbuddy_adapter)
|
||||
rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
|
||||
#endif
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
|
||||
|
|
@ -400,7 +400,7 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
|
|||
else
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(pbuddy_adapter)
|
||||
if (pbuddy_adapter)
|
||||
rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
|
||||
#endif
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
|
||||
|
|
@ -411,7 +411,7 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
|
|||
|
||||
val8 = rtw_read8(padapter, FW_DYNAMIC_FUN_SWITCH);
|
||||
|
||||
if(enable == _TRUE)
|
||||
if (enable == _TRUE)
|
||||
{
|
||||
rtw_write8(padapter, FW_DYNAMIC_FUN_SWITCH, (val8 | mode));
|
||||
}
|
||||
|
|
@ -436,7 +436,7 @@ static void Set_NETYPE0_MSR(_adapter *padapter, u8 type)
|
|||
void Set_MSR(_adapter *padapter, u8 type)
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(padapter->iface_type == IFACE_PORT1)
|
||||
if (padapter->iface_type == IFACE_PORT1)
|
||||
{
|
||||
Set_NETYPE1_MSR(padapter, type);
|
||||
}
|
||||
|
|
@ -570,7 +570,7 @@ void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char
|
|||
DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode );
|
||||
}
|
||||
|
||||
if((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE))
|
||||
if ((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE))
|
||||
{
|
||||
//SelectChannel(padapter, channel);
|
||||
center_ch = channel;
|
||||
|
|
@ -657,7 +657,7 @@ int is_client_associated_to_ap(_adapter *padapter)
|
|||
struct mlme_ext_priv *pmlmeext;
|
||||
struct mlme_ext_info *pmlmeinfo;
|
||||
|
||||
if(!padapter)
|
||||
if (!padapter)
|
||||
return _FAIL;
|
||||
|
||||
pmlmeext = &padapter->mlmeextpriv;
|
||||
|
|
@ -742,10 +742,10 @@ static u32 _ReadCAM(_adapter *padapter ,u32 addr)
|
|||
rtw_write32(padapter, RWCAM, cmd);
|
||||
|
||||
do{
|
||||
if(0 == (rtw_read32(padapter,REG_CAMCMD) & CAM_POLLINIG)){
|
||||
if (0 == (rtw_read32(padapter,REG_CAMCMD) & CAM_POLLINIG)){
|
||||
break;
|
||||
}
|
||||
}while(count++ < 100);
|
||||
}while (count++ < 100);
|
||||
|
||||
return rtw_read32(padapter,REG_CAMREAD);
|
||||
}
|
||||
|
|
@ -867,25 +867,25 @@ void flush_all_cam_entry(_adapter *padapter)
|
|||
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
||||
//if(check_buddy_mlmeinfo_state(padapter, _HW_STATE_NOLINK_))
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED) == _FALSE)
|
||||
//if (check_buddy_mlmeinfo_state(padapter, _HW_STATE_NOLINK_))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED) == _FALSE)
|
||||
{
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE))
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
|
||||
{
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct sta_info *psta;
|
||||
u8 cam_id;//cam_entry
|
||||
|
||||
psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress);
|
||||
if(psta) {
|
||||
if(psta->state & WIFI_AP_STATE)
|
||||
if (psta) {
|
||||
if (psta->state & WIFI_AP_STATE)
|
||||
{} //clear cam when ap free per sta_info
|
||||
else {
|
||||
if(psta->mac_id==2)
|
||||
if (psta->mac_id==2)
|
||||
cam_id = 5;
|
||||
else
|
||||
cam_id = 4;
|
||||
|
|
@ -894,7 +894,7 @@ void flush_all_cam_entry(_adapter *padapter)
|
|||
rtw_clearstakey_cmd(padapter, (u8*)psta, cam_id, _FALSE);
|
||||
}
|
||||
}
|
||||
else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
|
||||
else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
|
||||
{
|
||||
//clear cam when ap free per sta_info
|
||||
}
|
||||
|
|
@ -952,7 +952,7 @@ int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
if(pmlmepriv->qospriv.qos_option==0)
|
||||
if (pmlmepriv->qospriv.qos_option==0)
|
||||
{
|
||||
pmlmeinfo->WMM_enable = 0;
|
||||
return _FAIL;
|
||||
|
|
@ -1004,7 +1004,7 @@ void WMMOnAssocRsp(_adapter *padapter)
|
|||
|
||||
acm_mask = 0;
|
||||
|
||||
if( pmlmeext->cur_wireless_mode == WIRELESS_11B)
|
||||
if ( pmlmeext->cur_wireless_mode == WIRELESS_11B)
|
||||
aSifsTime = 10;
|
||||
else
|
||||
aSifsTime = 16;
|
||||
|
|
@ -1053,35 +1053,35 @@ void WMMOnAssocRsp(_adapter *padapter)
|
|||
DBG_871X("WMM(%x): %x, %x\n", ACI, ACM, acParm);
|
||||
}
|
||||
|
||||
if(padapter->registrypriv.acm_method == 1)
|
||||
if (padapter->registrypriv.acm_method == 1)
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_ACM_CTRL, (u8 *)(&acm_mask));
|
||||
else
|
||||
padapter->mlmepriv.acm_mask = acm_mask;
|
||||
|
||||
inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3;
|
||||
|
||||
if(pregpriv->wifi_spec==1)
|
||||
if (pregpriv->wifi_spec==1)
|
||||
{
|
||||
u32 j, tmp, change_inx;
|
||||
|
||||
//entry indx: 0->vo, 1->vi, 2->be, 3->bk.
|
||||
for(i=0; i<4; i++)
|
||||
for (i=0; i<4; i++)
|
||||
{
|
||||
for(j=i+1; j<4; j++)
|
||||
for (j=i+1; j<4; j++)
|
||||
{
|
||||
//compare CW and AIFS
|
||||
if((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF))
|
||||
if ((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF))
|
||||
{
|
||||
change_inx = _TRUE;
|
||||
}
|
||||
else if((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF))
|
||||
else if ((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF))
|
||||
{
|
||||
//compare TXOP
|
||||
if((edca[j] >> 16) > (edca[i] >> 16))
|
||||
if ((edca[j] >> 16) > (edca[i] >> 16))
|
||||
change_inx = _TRUE;
|
||||
}
|
||||
|
||||
if(change_inx)
|
||||
if (change_inx)
|
||||
{
|
||||
tmp = edca[i];
|
||||
edca[i] = edca[j];
|
||||
|
|
@ -1097,7 +1097,7 @@ void WMMOnAssocRsp(_adapter *padapter)
|
|||
}
|
||||
}
|
||||
|
||||
for(i=0; i<4; i++) {
|
||||
for (i=0; i<4; i++) {
|
||||
pxmitpriv->wmm_para_seq[i] = inx[i];
|
||||
DBG_871X("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
|
||||
}
|
||||
|
|
@ -1117,17 +1117,17 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
if(!pIE)
|
||||
if (!pIE)
|
||||
return;
|
||||
|
||||
if(phtpriv->ht_option == _FALSE) return;
|
||||
if (phtpriv->ht_option == _FALSE) return;
|
||||
|
||||
if(pIE->Length > sizeof(struct HT_info_element))
|
||||
if (pIE->Length > sizeof(struct HT_info_element))
|
||||
return;
|
||||
|
||||
pHT_info = (struct HT_info_element *)pIE->data;
|
||||
|
||||
if((pHT_info->infos[0] & BIT(2)) && pregistrypriv->cbw40_enable )
|
||||
if ((pHT_info->infos[0] & BIT(2)) && pregistrypriv->cbw40_enable )
|
||||
{
|
||||
new_bwmode = HT_CHANNEL_WIDTH_40;
|
||||
|
||||
|
|
@ -1153,7 +1153,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
}
|
||||
|
||||
|
||||
if((new_bwmode!= pmlmeext->cur_bwmode) || (new_ch_offset!=pmlmeext->cur_ch_offset))
|
||||
if ((new_bwmode!= pmlmeext->cur_bwmode) || (new_ch_offset!=pmlmeext->cur_ch_offset))
|
||||
{
|
||||
pmlmeinfo->bwmode_updated = _TRUE;
|
||||
|
||||
|
|
@ -1169,7 +1169,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
}
|
||||
|
||||
|
||||
if(_TRUE == pmlmeinfo->bwmode_updated)
|
||||
if (_TRUE == pmlmeinfo->bwmode_updated)
|
||||
{
|
||||
struct sta_info *psta;
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
|
|
@ -1180,11 +1180,11 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
|
||||
//update ap's stainfo
|
||||
psta = rtw_get_stainfo(pstapriv, cur_network->MacAddress);
|
||||
if(psta)
|
||||
if (psta)
|
||||
{
|
||||
struct ht_priv *phtpriv_sta = &psta->htpriv;
|
||||
|
||||
if(phtpriv_sta->ht_option)
|
||||
if (phtpriv_sta->ht_option)
|
||||
{
|
||||
// bwmode
|
||||
phtpriv_sta->bwmode = pmlmeext->cur_bwmode;
|
||||
|
|
@ -1216,9 +1216,9 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
|
||||
if(pIE==NULL) return;
|
||||
if (pIE==NULL) return;
|
||||
|
||||
if(phtpriv->ht_option == _FALSE) return;
|
||||
if (phtpriv->ht_option == _FALSE) return;
|
||||
|
||||
pmlmeinfo->HT_caps_enable = 1;
|
||||
|
||||
|
|
@ -1266,14 +1266,14 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
//update the MCS rates
|
||||
for (i = 0; i < 16; i++)
|
||||
{
|
||||
if((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
|
||||
if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
|
||||
{
|
||||
pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef CONFIG_DISABLE_MCS13TO15
|
||||
if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregistrypriv->wifi_spec!=1))
|
||||
if (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregistrypriv->wifi_spec!=1))
|
||||
pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R_MCS13TO15_OFF[i];
|
||||
else
|
||||
pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
|
||||
|
|
@ -1299,12 +1299,12 @@ void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
if(pIE==NULL) return;
|
||||
if (pIE==NULL) return;
|
||||
|
||||
if(phtpriv->ht_option == _FALSE) return;
|
||||
if (phtpriv->ht_option == _FALSE) return;
|
||||
|
||||
|
||||
if(pIE->Length > sizeof(struct HT_info_element))
|
||||
if (pIE->Length > sizeof(struct HT_info_element))
|
||||
return;
|
||||
|
||||
pmlmeinfo->HT_info_enable = 1;
|
||||
|
|
@ -1380,7 +1380,7 @@ void HTOnAssocRsp(_adapter *padapter)
|
|||
// Config SM Power Save setting
|
||||
//
|
||||
pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2;
|
||||
if(pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
|
||||
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
|
||||
{
|
||||
/*u8 i;
|
||||
//update the MCS rates
|
||||
|
|
@ -1404,7 +1404,7 @@ void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
if(pIE->Length>1)
|
||||
if (pIE->Length>1)
|
||||
return;
|
||||
|
||||
pmlmeinfo->ERP_enable = 1;
|
||||
|
|
@ -1466,13 +1466,13 @@ int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len)
|
|||
{
|
||||
u8 tdls_prohibited_bit = 0x40; //bit(38); TDLS_prohibited
|
||||
|
||||
if(pkt_len < 5)
|
||||
if (pkt_len < 5)
|
||||
{
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
pframe += 4;
|
||||
if( (*pframe) & tdls_prohibited_bit )
|
||||
if ( (*pframe) & tdls_prohibited_bit )
|
||||
return _TRUE;
|
||||
|
||||
return _FALSE;
|
||||
|
|
@ -1521,7 +1521,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
|
||||
subtype = GetFrameSubType(pframe) >> 4;
|
||||
|
||||
if(subtype==WIFI_BEACON)
|
||||
if (subtype==WIFI_BEACON)
|
||||
bssid->Reserved[0] = 1;
|
||||
|
||||
bssid->Length = sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + len;
|
||||
|
|
@ -1533,7 +1533,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
/* check bw and channel offset */
|
||||
/* parsing HT_CAP_IE */
|
||||
p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
|
||||
if(p && len>0) {
|
||||
if (p && len>0) {
|
||||
pht_cap = (struct rtw_ieee80211_ht_cap *)(p + 2);
|
||||
ht_cap_info = pht_cap->cap_info;
|
||||
} else {
|
||||
|
|
@ -1541,7 +1541,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
}
|
||||
/* parsing HT_INFO_IE */
|
||||
p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
|
||||
if(p && len>0) {
|
||||
if (p && len>0) {
|
||||
pht_info = (struct HT_info_element *)(p + 2);
|
||||
ht_info_infos_0 = pht_info->infos[0];
|
||||
} else {
|
||||
|
|
@ -1569,7 +1569,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
bcn_channel = *(p + 2);
|
||||
} else {/* In 5G, some ap do not have DSSET IE checking HT info for channel */
|
||||
p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
|
||||
if(pht_info) {
|
||||
if (pht_info) {
|
||||
bcn_channel = pht_info->primary_channel;
|
||||
} else { /* we don't find channel IE, so don't check it */
|
||||
DBG_871X("Oops: %s we don't find channel IE, so don't check it \n", __func__);
|
||||
|
|
@ -1590,7 +1590,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
hidden_ssid = _FALSE;
|
||||
}
|
||||
|
||||
if((NULL != p) && (_FALSE == hidden_ssid && (*(p + 1)))) {
|
||||
if ((NULL != p) && (_FALSE == hidden_ssid && (*(p + 1)))) {
|
||||
_rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
|
||||
bssid->Ssid.SsidLength = *(p + 1);
|
||||
} else {
|
||||
|
|
@ -1645,7 +1645,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
|
||||
if (encryp_protocol == ENCRYP_PROTOCOL_WPA || encryp_protocol == ENCRYP_PROTOCOL_WPA2) {
|
||||
pbuf = rtw_get_wpa_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength-12);
|
||||
if(pbuf && (wpa_ielen>0)) {
|
||||
if (pbuf && (wpa_ielen>0)) {
|
||||
if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x)) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
||||
("%s pnetwork->pairwise_cipher: %d, group_cipher is %d, is_8021x is %d\n", __func__,
|
||||
|
|
@ -1654,7 +1654,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
} else {
|
||||
pbuf = rtw_get_wpa2_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength-12);
|
||||
|
||||
if(pbuf && (wpa_ielen>0)) {
|
||||
if (pbuf && (wpa_ielen>0)) {
|
||||
if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x)) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
||||
("%s pnetwork->pairwise_cipher: %d, pnetwork->group_cipher is %d, is_802x is %d\n",
|
||||
|
|
@ -1729,7 +1729,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
|
|||
|
||||
#ifdef CONFIG_TDLS
|
||||
case _EXT_CAP_IE_:
|
||||
if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == _TRUE )
|
||||
if ( check_ap_tdls_prohibited(pIE->data, pIE->Length) == _TRUE )
|
||||
ptdlsinfo->ap_prohibited = _TRUE;
|
||||
break;
|
||||
#endif //CONFIG_TDLS
|
||||
|
|
@ -2029,9 +2029,9 @@ unsigned char get_highest_rate_idx(u32 mask)
|
|||
int i;
|
||||
unsigned char rate_idx=0;
|
||||
|
||||
for(i=27; i>=0; i--)
|
||||
for (i=27; i>=0; i--)
|
||||
{
|
||||
if(mask & BIT(i))
|
||||
if (mask & BIT(i))
|
||||
{
|
||||
rate_idx = i;
|
||||
break;
|
||||
|
|
@ -2086,7 +2086,7 @@ void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
|
|||
// Added by Albert 2011/03/22
|
||||
// In the P2P mode, the driver should not support the b mode.
|
||||
// So, the Tx packet shouldn't use the CCK rate
|
||||
if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
#endif //CONFIG_P2P
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
|
|
@ -2172,7 +2172,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
|
|||
else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3))
|
||||
{
|
||||
epigram_vendor_flag = 1;
|
||||
if(ralink_vendor_flag) {
|
||||
if (ralink_vendor_flag) {
|
||||
DBG_871X("link to Tenda W311R AP\n");
|
||||
return HT_IOT_PEER_TENDA;
|
||||
} else {
|
||||
|
|
@ -2243,12 +2243,12 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap)
|
|||
|
||||
// Check preamble mode, 2005.01.06, by rcnjko.
|
||||
// Mark to update preamble value forever, 2008.03.18 by lanhsin
|
||||
//if( pMgntInfo->RegPreambleMode == PREAMBLE_AUTO )
|
||||
//if ( pMgntInfo->RegPreambleMode == PREAMBLE_AUTO )
|
||||
{
|
||||
|
||||
if(updateCap & cShortPreamble)
|
||||
if (updateCap & cShortPreamble)
|
||||
{ // Short Preamble
|
||||
if(pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO
|
||||
if (pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO
|
||||
{
|
||||
ShortPreamble = _TRUE;
|
||||
pmlmeinfo->preamble_mode = PREAMBLE_SHORT;
|
||||
|
|
@ -2257,7 +2257,7 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap)
|
|||
}
|
||||
else
|
||||
{ // Long Preamble
|
||||
if(pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO
|
||||
if (pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO
|
||||
{
|
||||
ShortPreamble = _FALSE;
|
||||
pmlmeinfo->preamble_mode = PREAMBLE_LONG;
|
||||
|
|
@ -2273,24 +2273,24 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap)
|
|||
else
|
||||
{
|
||||
//Filen: See 802.11-2007 p.90
|
||||
if( pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11_24N))
|
||||
if ( pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11_24N))
|
||||
{
|
||||
if( (updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
|
||||
if ( (updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
|
||||
{ // Short Slot Time
|
||||
if(pmlmeinfo->slotTime != SHORT_SLOT_TIME)
|
||||
if (pmlmeinfo->slotTime != SHORT_SLOT_TIME)
|
||||
{
|
||||
pmlmeinfo->slotTime = SHORT_SLOT_TIME;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // Long Slot Time
|
||||
if(pmlmeinfo->slotTime != NON_SHORT_SLOT_TIME)
|
||||
if (pmlmeinfo->slotTime != NON_SHORT_SLOT_TIME)
|
||||
{
|
||||
pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if( pmlmeext->cur_wireless_mode & (WIRELESS_11A | WIRELESS_11_5N))
|
||||
else if ( pmlmeext->cur_wireless_mode & (WIRELESS_11A | WIRELESS_11_5N))
|
||||
{
|
||||
pmlmeinfo->slotTime = SHORT_SLOT_TIME;
|
||||
}
|
||||
|
|
@ -2321,7 +2321,7 @@ void update_wireless_mode(_adapter *padapter)
|
|||
pmlmeinfo->HT_enable = 1;
|
||||
}
|
||||
|
||||
if(pmlmeext->cur_channel > 14)
|
||||
if (pmlmeext->cur_channel > 14)
|
||||
{
|
||||
if (pmlmeinfo->HT_enable)
|
||||
{
|
||||
|
|
@ -2341,7 +2341,7 @@ void update_wireless_mode(_adapter *padapter)
|
|||
{
|
||||
network_type |= WIRELESS_11B;
|
||||
}
|
||||
else if((cckrates_included(rate, ratelen)) == _TRUE)
|
||||
else if ((cckrates_included(rate, ratelen)) == _TRUE)
|
||||
{
|
||||
network_type |= WIRELESS_11BG;
|
||||
}
|
||||
|
|
@ -2353,7 +2353,7 @@ void update_wireless_mode(_adapter *padapter)
|
|||
|
||||
pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;
|
||||
/*
|
||||
if((pmlmeext->cur_wireless_mode==WIRELESS_11G) ||
|
||||
if ((pmlmeext->cur_wireless_mode==WIRELESS_11G) ||
|
||||
(pmlmeext->cur_wireless_mode==WIRELESS_11BG))//WIRELESS_MODE_G)
|
||||
SIFS_Timer = 0x0a0a;//CCK
|
||||
else
|
||||
|
|
@ -2404,7 +2404,7 @@ void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id)
|
|||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
if(pmlmeext->cur_wireless_mode & WIRELESS_11B)
|
||||
if (pmlmeext->cur_wireless_mode & WIRELESS_11B)
|
||||
{
|
||||
// Only B, B/G, and B/G/N AP could use CCK rate
|
||||
_rtw_memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_cck, 4);
|
||||
|
|
@ -2454,7 +2454,7 @@ void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr)
|
|||
|
||||
psta = rtw_get_stainfo(pstapriv, addr);
|
||||
|
||||
if(psta)
|
||||
if (psta)
|
||||
{
|
||||
start_seq = le16_to_cpu(preq->BA_starting_seqctrl) >> 4;
|
||||
|
||||
|
|
@ -2615,7 +2615,7 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
|
|||
if (init) {
|
||||
#if 0
|
||||
/* For SMSP on 92DU-VC, driver do not probe another Interface. */
|
||||
if(dvobj->NumInterfaces == 2 && dvobj->InterfaceNumber != 0 &&
|
||||
if (dvobj->NumInterfaces == 2 && dvobj->InterfaceNumber != 0 &&
|
||||
adapter->registrypriv.mac_phy_mode == 1) {
|
||||
DBG_871X("%s(): Do not init another USB Interface because SMSP\n",__FUNCTION__);
|
||||
status = _FAIL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue