|
@@ -193,8 +193,8 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)
|
|
|
if (rate == 0) {
|
|
|
/* 2005.01.26, by rcnjko. */
|
|
|
if(ieee->mode == IEEE_A||
|
|
|
- ieee->mode== IEEE_N_5G||
|
|
|
- (ieee->mode== IEEE_N_24G&&!pHTInfo->bCurSuppCCK))
|
|
|
+ ieee->mode == IEEE_N_5G||
|
|
|
+ (ieee->mode == IEEE_N_24G&&!pHTInfo->bCurSuppCCK))
|
|
|
rate = 0x0c;
|
|
|
else
|
|
|
rate = 0x02;
|
|
@@ -1315,7 +1315,7 @@ static void ieee80211_associate_complete_wq(struct work_struct *work)
|
|
|
}
|
|
|
ieee->LinkDetectInfo.SlotNum = 2 * (1 + ieee->current_network.beacon_interval/500);
|
|
|
// To prevent the immediately calling watch_dog after association.
|
|
|
- if (ieee->LinkDetectInfo.NumRecvBcnInPeriod==0||ieee->LinkDetectInfo.NumRecvDataInPeriod==0 )
|
|
|
+ if (ieee->LinkDetectInfo.NumRecvBcnInPeriod == 0||ieee->LinkDetectInfo.NumRecvDataInPeriod == 0 )
|
|
|
{
|
|
|
ieee->LinkDetectInfo.NumRecvBcnInPeriod = 1;
|
|
|
ieee->LinkDetectInfo.NumRecvDataInPeriod= 1;
|
|
@@ -1391,8 +1391,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
|
|
|
*/
|
|
|
apset = ieee->wap_set;//(memcmp(ieee->current_network.bssid, zero,ETH_ALEN)!=0 );
|
|
|
ssidset = ieee->ssid_set;//ieee->current_network.ssid[0] != '\0';
|
|
|
- ssidbroad = !(net->ssid_len == 0 || net->ssid[0]== '\0');
|
|
|
- apmatch = (memcmp(ieee->current_network.bssid, net->bssid, ETH_ALEN)==0);
|
|
|
+ ssidbroad = !(net->ssid_len == 0 || net->ssid[0] == '\0');
|
|
|
+ apmatch = (memcmp(ieee->current_network.bssid, net->bssid, ETH_ALEN) == 0);
|
|
|
ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\
|
|
|
(!strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len));
|
|
|
|
|
@@ -1595,8 +1595,8 @@ static inline u16 assoc_parse(struct ieee80211_device *ieee, struct sk_buff *skb
|
|
|
*aid = le16_to_cpu(response_head->aid) & 0x3fff;
|
|
|
|
|
|
status_code = le16_to_cpu(response_head->status);
|
|
|
- if((status_code==WLAN_STATUS_ASSOC_DENIED_RATES || \
|
|
|
- status_code==WLAN_STATUS_CAPS_UNSUPPORTED)&&
|
|
|
+ if((status_code == WLAN_STATUS_ASSOC_DENIED_RATES || \
|
|
|
+ status_code == WLAN_STATUS_CAPS_UNSUPPORTED)&&
|
|
|
((ieee->mode == IEEE_G) &&
|
|
|
(ieee->current_network.mode == IEEE_N_24G) &&
|
|
|
(ieee->AsocRetryCount++ < (RT_ASOC_RETRY_LIMIT-1)))) {
|