Commit 77438bd8 authored by Ana Rey's avatar Ana Rey Committed by Peter P Waskiewicz Jr

staging: rtl8187se: Re-write if statement with comment lines inside.

Move comments from inside if conditionals to the lines above the
if-statement. Also delete unnecessary whitespace in these lines.
Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 25778bbe
...@@ -1224,18 +1224,22 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, ...@@ -1224,18 +1224,22 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee,
else else
ssidmatch = (0==strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len)); ssidmatch = (0==strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len));
if ( /* if the user set the AP check if match. /* if the user set the AP check if match.
* if the network does not broadcast essid we check the user supplied ANY essid * if the network does not broadcast essid we check the user
* if the network does broadcast and the user does not set essid it is OK * supplied ANY essid
* if the network does broadcast and the user did set essid chech if essid match * if the network does broadcast and the user does not set essid
* it is OK
* if the network does broadcast and the user did set essid
* chech if essid match
* (apset && apmatch && ((ssidset && ssidbroad && ssidmatch) ||
* (ssidbroad && !ssidset) || (!ssidbroad && ssidset))) ||
* if the ap is not set, check that the user set the bssid and
* the network does broadcast and that those two bssid matches
* (!apset && ssidset && ssidbroad && ssidmatch)
*/ */
( apset && apmatch && if ((apset && apmatch && ((ssidset && ssidbroad && ssidmatch) ||
((ssidset && ssidbroad && ssidmatch) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset)) ) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset))) ||
/* if the ap is not set, check that the user set the bssid (!apset && ssidset && ssidbroad && ssidmatch)) {
* and the network does broadcast and that those two bssid matches
*/
(!apset && ssidset && ssidbroad && ssidmatch)
){
/* if the essid is hidden replace it with the /* if the essid is hidden replace it with the
* essid provided by the user. * essid provided by the user.
*/ */
...@@ -1685,7 +1689,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, ...@@ -1685,7 +1689,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
info_element = (struct ieee80211_info_element *) info_element = (struct ieee80211_info_element *)
&info_element->data[info_element->len]; &info_element->data[info_element->len];
} }
if(!ieee->init_wmmparam_flag) /* legacy AP, reset the AC_xx_param register */ /* legacy AP, reset the AC_xx_param register */
if(!ieee->init_wmmparam_flag)
{ {
queue_work(ieee->wq,&ieee->wmm_param_update_wq); queue_work(ieee->wq,&ieee->wmm_param_update_wq);
ieee->init_wmmparam_flag = 1; /* indicate AC_xx_param upated since last associate */ ieee->init_wmmparam_flag = 1; /* indicate AC_xx_param upated since last associate */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment