forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8187se: Fix whitespaces in if-statement.

Browse source 
Fix whitespaces around braces in if-statement as the
codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c
Also, fix coding style in these lines when It is necessary.

Fix checkpatch.pl errors:
ERROR: space required before the open brace '{'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
This commit is contained in:
Ana Rey 2014-03-16 20:44:26 +01:00 • committed by Peter P Waskiewicz Jr
parent 3dde47c631
commit 08d49d6487
1 changed files with 87 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

55
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
View file

@ -402,12 +402,11 @@ static void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
* if the state become LINKED because of the #1 situation
*/
if (ieee->state == IEEE80211_LINKED)
if (ieee->state == IEEE80211_LINKED) {
goto out;
}
ieee->set_chan(ieee->dev, ch);
if(channel_map[ch] == 1)
{
if( channel_map[ch] == 1) {
ieee80211_send_probe_requests(ieee);
}
/* this prevent excessive time wait when we
@ -454,16 +453,13 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee)
* So the only situation in witch are interested is to check
* if the state become LINKED because of the #1 situation
*/
if (ieee->state == IEEE80211_LINKED)
{
if (ieee->state == IEEE80211_LINKED) {
goto out;
}
if(channel_map[ieee->current_network.channel] > 0)
{
if (channel_map[ieee->current_network.channel] > 0) {
ieee->set_chan(ieee->dev, ieee->current_network.channel);
}
if(channel_map[ieee->current_network.channel] == 1)
{
if (channel_map[ieee->current_network.channel] == 1) {
ieee80211_send_probe_requests(ieee);
}
@ -499,8 +495,7 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)
goto out; /* no good chans */
}while(!channel_map[ieee->current_network.channel]);
if (ieee->scanning == 0 )
{
if (ieee->scanning == 0 ) {
printk("error out, scanning = 0\n");
goto out;
}
@ -585,16 +580,13 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee)
/* called with ieee->lock held */
void ieee80211_rtl_start_scan(struct ieee80211_device *ieee)
{
if(IS_DOT11D_ENABLE(ieee) )
{
if(IS_COUNTRY_IE_VALID(ieee))
{
if (IS_DOT11D_ENABLE(ieee)) {
if (IS_COUNTRY_IE_VALID(ieee)) {
RESET_CIE_WATCHDOG(ieee);
}
}
if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) {
if (ieee->scanning == 0)
{
if (ieee->scanning == 0) {
ieee->scanning = 1;
#if 1
queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq,0);
@ -607,10 +599,8 @@ void ieee80211_rtl_start_scan(struct ieee80211_device *ieee)
/* called with wx_sem held */
void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
{
if(IS_DOT11D_ENABLE(ieee) )
{
if(IS_COUNTRY_IE_VALID(ieee))
{
if (IS_DOT11D_ENABLE(ieee)) {
if (IS_COUNTRY_IE_VALID(ieee)) {
RESET_CIE_WATCHDOG(ieee);
}
}
@ -761,10 +751,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee,
tag+=rate_ex_len-2;
}
if (wpa_ie_len)
{
if (ieee->iw_mode == IW_MODE_ADHOC)
{
if (wpa_ie_len) {
if (ieee->iw_mode == IW_MODE_ADHOC) {
/* as Windows will set pairwise key same as the group
* key which is not allowed in Linux, so set this for
* IOT issue.
@ -1619,8 +1607,7 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
ieee->assoc_id = aid;
ieee->softmac_stats.rx_ass_ok++;
/* card type is 8187 */
if(1 == rx_stats->nic_type)
{
if (1 == rx_stats->nic_type) {
goto associate_complete;
}
assoc_resp = (struct ieee80211_assoc_response_frame*)skb->data;
@ -1671,8 +1658,7 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
&info_element->data[info_element->len];
}
/* legacy AP, reset the AC_xx_param register */
if(!ieee->init_wmmparam_flag)
{
if (!ieee->init_wmmparam_flag) {
queue_work(ieee->wq,&ieee->wmm_param_update_wq);
ieee->init_wmmparam_flag = 1; /* indicate AC_xx_param upated since last associate */
}
@ -2044,10 +2030,8 @@ void ieee80211_start_bss(struct ieee80211_device *ieee)
* STA shall not start a BSS unless properly formed Beacon frame
* including a Country IE.
*/
if(IS_DOT11D_ENABLE(ieee) && !IS_COUNTRY_IE_VALID(ieee))
{
if(! ieee->bGlobalDomain)
{
if (IS_DOT11D_ENABLE(ieee) && !IS_COUNTRY_IE_VALID(ieee)) {
if(!ieee->bGlobalDomain) {
return;
}
}
@ -2127,8 +2111,7 @@ static void ieee80211_associate_retry_wq(struct work_struct *work)
ieee->actscanning = true;
ieee80211_rtl_start_scan(ieee);
}
if(ieee->state == IEEE80211_NOLINK)
{
if (ieee->state == IEEE80211_NOLINK) {
notify_wx_assoc_event(ieee);
}
spin_unlock_irqrestore(&ieee->lock, flags);