openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.c 

The following warnings fixed.
- WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
YAMANE Toshiaki 2012-11-28 22:20:53 +09:00 committed by Greg Kroah-Hartman
parent 73b612b14c
commit 0f18f5b9cb
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
View File

@ -505,13 +505,11 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
//YJ,add,080828,for keep alive //YJ,add,080828,for keep alive
if ((fc & IEEE80211_FCTL_TODS) != IEEE80211_FCTL_TODS) { if ((fc & IEEE80211_FCTL_TODS) != IEEE80211_FCTL_TODS) {
if (!memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { if (!memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN))
ieee->NumRxUnicast++; ieee->NumRxUnicast++;
}
} else { } else {
if (!memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) { if (!memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN))
ieee->NumRxUnicast++; ieee->NumRxUnicast++;
}
} }
//YJ,add,080828,for keep alive,end //YJ,add,080828,for keep alive,end
@ -611,9 +609,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
type, stype, skb->len); type, stype, skb->len);
goto rx_dropped; goto rx_dropped;
} }
if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN)) { if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN))
goto rx_dropped; goto rx_dropped;
}
ieee->NumRxDataInPeriod++; ieee->NumRxDataInPeriod++;
ieee->NumRxOkTotal++; ieee->NumRxOkTotal++;
@ -806,27 +803,27 @@ static inline int ieee80211_SignalStrengthTranslate(
int RetSS; int RetSS;
// Step 1. Scale mapping. // Step 1. Scale mapping.
if (CurrSS >= 71 && CurrSS <= 100) { if (CurrSS >= 71 && CurrSS <= 100)
RetSS = 90 + ((CurrSS - 70) / 3); RetSS = 90 + ((CurrSS - 70) / 3);
} else if (CurrSS >= 41 && CurrSS <= 70) { else if (CurrSS >= 41 && CurrSS <= 70)
RetSS = 78 + ((CurrSS - 40) / 3); RetSS = 78 + ((CurrSS - 40) / 3);
} else if (CurrSS >= 31 && CurrSS <= 40) { else if (CurrSS >= 31 && CurrSS <= 40)
RetSS = 66 + (CurrSS - 30); RetSS = 66 + (CurrSS - 30);
} else if (CurrSS >= 21 && CurrSS <= 30) { else if (CurrSS >= 21 && CurrSS <= 30)
RetSS = 54 + (CurrSS - 20); RetSS = 54 + (CurrSS - 20);
} else if (CurrSS >= 5 && CurrSS <= 20) { else if (CurrSS >= 5 && CurrSS <= 20)
RetSS = 42 + (((CurrSS - 5) * 2) / 3); RetSS = 42 + (((CurrSS - 5) * 2) / 3);
} else if (CurrSS == 4) { else if (CurrSS == 4)
RetSS = 36; RetSS = 36;
} else if (CurrSS == 3) { else if (CurrSS == 3)
RetSS = 27; RetSS = 27;
} else if (CurrSS == 2) { else if (CurrSS == 2)
RetSS = 18; RetSS = 18;
} else if (CurrSS == 1) { else if (CurrSS == 1)
RetSS = 9; RetSS = 9;
} else { else
RetSS = CurrSS; RetSS = CurrSS;
}
//RT_TRACE(COMP_DBG, DBG_LOUD, ("##### After Mapping: LastSS: %d, CurrSS: %d, RetSS: %d\n", LastSS, CurrSS, RetSS)); //RT_TRACE(COMP_DBG, DBG_LOUD, ("##### After Mapping: LastSS: %d, CurrSS: %d, RetSS: %d\n", LastSS, CurrSS, RetSS));
// Step 2. Smoothing. // Step 2. Smoothing.
@ -848,9 +845,8 @@ static inline void ieee80211_extract_country_ie(
memcpy(network->CountryIeBuf, info_element->data, info_element->len); memcpy(network->CountryIeBuf, info_element->data, info_element->len);
network->CountryIeLen = info_element->len; network->CountryIeLen = info_element->len;
if (!IS_COUNTRY_IE_VALID(ieee)) { if (!IS_COUNTRY_IE_VALID(ieee))
Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data); Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data);
}
} }
// //
@ -858,9 +854,8 @@ static inline void ieee80211_extract_country_ie(
// some AP (e.g. Cisco 1242) don't include country IE in their // some AP (e.g. Cisco 1242) don't include country IE in their
// probe response frame. // probe response frame.
// //
if (IS_EQUAL_CIE_SRC(ieee, addr2)) { if (IS_EQUAL_CIE_SRC(ieee, addr2))
UPDATE_CIE_WATCHDOG(ieee); UPDATE_CIE_WATCHDOG(ieee);
}
} }
} }
@ -1058,9 +1053,9 @@ inline int ieee80211_network_init(
// info_element->data[3+offset] , // info_element->data[3+offset] ,
// info_element->data[3+offset] & (1<<(ieee->assoc_id%8))); // info_element->data[3+offset] & (1<<(ieee->assoc_id%8)));
if (info_element->data[3+offset] & (1<<(ieee->assoc_id%8))) { if (info_element->data[3+offset] & (1<<(ieee->assoc_id%8)))
network->dtim_data |= IEEE80211_DTIM_UCAST; network->dtim_data |= IEEE80211_DTIM_UCAST;
}
break; break;
case MFIE_TYPE_IBSS_SET: case MFIE_TYPE_IBSS_SET:
@ -1094,9 +1089,8 @@ inline int ieee80211_network_init(
info_element->data[4] == 0x02) { info_element->data[4] == 0x02) {
network->Turbo_Enable = 1; network->Turbo_Enable = 1;
} }
if (1 == stats->nic_type) {//nic 87 if (1 == stats->nic_type) //nic 87
break; break;
}
if (info_element->len >= 5 && if (info_element->len >= 5 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
@ -1210,9 +1204,8 @@ inline void update_network(struct ieee80211_network *dst,
unsigned char quality = src->stats.signalstrength; unsigned char quality = src->stats.signalstrength;
unsigned char signal = 0; unsigned char signal = 0;
unsigned char noise = 0; unsigned char noise = 0;
if (dst->stats.signalstrength > 0) { if (dst->stats.signalstrength > 0)
quality = (dst->stats.signalstrength * 5 + src->stats.signalstrength + 5)/6; quality = (dst->stats.signalstrength * 5 + src->stats.signalstrength + 5)/6;
}
signal = ieee80211_TranslateToDbm(quality); signal = ieee80211_TranslateToDbm(quality);
//noise = signal - src->stats.noise; //noise = signal - src->stats.noise;
if (dst->stats.noise > 0) if (dst->stats.noise > 0)