Skip to content

Commit

Permalink
staging: rtl8187se: Add whitespaces around '&', '||' and '&&'
Browse files Browse the repository at this point in the history
Add whitespaces around '&', '||' and '&&' as the codingStyle of the kernel
recommends.

Fix checkpatch.pl errors:
ERROR: spaces required around that '||' (ctx:VxV)
ERROR: spaces required around that '&&' (ctx:VxV)
ERROR: need consistent spacing around '&'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
  • Loading branch information
Ana Rey authored and Peter P Waskiewicz Jr committed Mar 17, 2014
1 parent b254a30 commit 7c6a49a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,

ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID;

if (dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
if (dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST) & ieee->ps))
return 2;

if (!time_after(jiffies, ieee->dev->trans_start + MSECS(timeout)))
Expand Down Expand Up @@ -1627,13 +1627,12 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
+ 8), (info_element->len - 8));

if (((ieee->current_network.wmm_info^info_element->data[6])& \
0x0f)||(!ieee->init_wmmparam_flag)) {
0x0f) || (!ieee->init_wmmparam_flag)) {
/* refresh parameter element for current network
* update the register parameter for hardware.
*/
ieee->init_wmmparam_flag = 1;
queue_work(ieee->wq, &ieee->wmm_param_update_wq);

}
/* update info_element for current network */
ieee->current_network.wmm_info = info_element->data[6];
Expand Down Expand Up @@ -2163,7 +2162,7 @@ void ieee80211_stop_protocol(struct ieee80211_device *ieee)
ieee->proto_started = 0;

ieee80211_stop_send_beacons(ieee);
if ((ieee->iw_mode == IW_MODE_INFRA)&&(ieee->state == IEEE80211_LINKED))
if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_LINKED))
SendDisassociation(ieee, NULL, WLAN_REASON_DISASSOC_STA_HAS_LEFT);

del_timer_sync(&ieee->associate_timer);
Expand Down

0 comments on commit 7c6a49a

Please sign in to comment.