lkml.org 
[lkml]   [2010]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/4] Staging: rtl8192su: ieee80211: fix brace coding style issue and other issues in ieee80211_softmac_wx.c Signed-off-by: Bashlykov Arthur <>
Date
---
.../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 22 ++-----------------
1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c
index 3e0527c..5743bcd 100644
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c
@@ -94,8 +94,6 @@ int ieee80211_wx_get_freq(struct ieee80211_device *ieee,
/* NM 0.7.0 will not accept channel any more. */
fwrq->m = ieee80211_wlan_frequencies[ieee->current_network.channel-1] * 100000;
fwrq->e = 1;
- /* fwrq->m = ieee->current_network.channel; */
- /* fwrq->e = 0; */

return 0;
}
@@ -230,7 +228,6 @@ int ieee80211_wx_get_rate(struct ieee80211_device *ieee,
union iwreq_data *wrqu, char *extra)
{
u32 tmp_rate = 0;
- /* printk("===>mode:%d, halfNmode:%d\n", ieee->mode, ieee->bHalfWirelessN24GMode); */
if (ieee->mode & (IEEE_A | IEEE_B | IEEE_G))
tmp_rate = ieee->rate;
else if (ieee->mode & IEEE_N_5G)
@@ -521,13 +518,10 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
int ret = 0;
#if 1
if {
- (!ieee->sta_wake_up) ||
- /* (!ieee->ps_request_tx_ack) || */
+ ((!ieee->sta_wake_up) ||
(!ieee->enter_sleep_state) ||
(!ieee->ps_is_queue_empty)) {

- /* printk("ERROR. PS mode is tryied to be use but driver missed a callback\n\n"); */
-
return -1;
}
#endif
@@ -537,18 +531,12 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
ieee->ps = IEEE80211_PS_DISABLED;
goto exit;
}
- if (wrqu->power.flags & IW_POWER_TIMEOUT) {
- /*ieee->ps_period = wrqu->power.value / 1000; */
+ if (wrqu->power.flags & IW_POWER_TIMEOUT)
ieee->ps_timeout = wrqu->power.value / 1000;
- }

- if (wrqu->power.flags & IW_POWER_PERIOD) {
-
- /* ieee->ps_timeout = wrqu->power.value / 1000; */
+ if (wrqu->power.flags & IW_POWER_PERIOD)
ieee->ps_period = wrqu->power.value / 1000;
- /* wrq->value / 1024; */

- }
switch (wrqu->power.flags & IW_POWER_MODE) {
case IW_POWER_UNICAST_R:
ieee->ps = IEEE80211_PS_UNICAST;
@@ -561,7 +549,6 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
break;

case IW_POWER_ON:
- /* ieee->ps = IEEE80211_PS_DISABLED; */
break;

default:
@@ -595,11 +582,8 @@ int ieee80211_wx_get_power(struct ieee80211_device *ieee,
wrqu->power.flags = IW_POWER_TIMEOUT;
wrqu->power.value = ieee->ps_timeout * 1000;
} else {
- /* ret = -EOPNOTSUPP; */
- /* goto exit; */
wrqu->power.flags = IW_POWER_PERIOD;
wrqu->power.value = ieee->ps_period * 1000;
-/*ieee->current_network.dtim_period * ieee->current_network.beacon_interval * 1024; */
}

if ((ieee->ps & (IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST)) == (IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST))
--
1.7.0.4


\
 
 \ /
  Last update: 2010-05-27 11:37    [W:0.029 / U:0.832 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site