diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-03-03 08:41:35 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 16:31:41 -0500 |
commit | 4559854d2db145e5c9a7c217f058e7bad706c097 (patch) | |
tree | 65de2fc13e320dc84b6a73ab14e9c757506a4430 /drivers/staging/rtl8192e/ieee80211 | |
parent | 477dfe7069ba8458f7ffe25c5ffcb91e70407bba (diff) |
staging: rtl8192e: Move eRFPowerState to r8192e_priv struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211')
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 8501c4aced6..8d2b5758d32 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h | |||
@@ -1988,7 +1988,6 @@ struct ieee80211_device { | |||
1988 | RT_PS_MODE dot11PowerSaveMode; // Power save mode configured. | 1988 | RT_PS_MODE dot11PowerSaveMode; // Power save mode configured. |
1989 | bool actscanning; | 1989 | bool actscanning; |
1990 | bool beinretry; | 1990 | bool beinretry; |
1991 | RT_RF_POWER_STATE eRFPowerState; | ||
1992 | RT_RF_CHANGE_SOURCE RfOffReason; | 1991 | RT_RF_CHANGE_SOURCE RfOffReason; |
1993 | bool is_set_key; | 1992 | bool is_set_key; |
1994 | //11n spec related I wonder if These info structure need to be moved out of ieee80211_device | 1993 | //11n spec related I wonder if These info structure need to be moved out of ieee80211_device |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index 2640a4f2e81..012256c0fc5 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -1420,17 +1420,6 @@ void ieee80211_associate_procedure_wq(struct work_struct *work) | |||
1420 | printk("===>%s(), chan:%d\n", __FUNCTION__, ieee->current_network.channel); | 1420 | printk("===>%s(), chan:%d\n", __FUNCTION__, ieee->current_network.channel); |
1421 | HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); | 1421 | HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); |
1422 | 1422 | ||
1423 | #ifdef ENABLE_IPS | ||
1424 | if(ieee->eRFPowerState == eRfOff) | ||
1425 | { | ||
1426 | if(ieee->ieee80211_ips_leave_wq != NULL) | ||
1427 | ieee->ieee80211_ips_leave_wq(ieee->dev); | ||
1428 | |||
1429 | up(&ieee->wx_sem); | ||
1430 | return; | ||
1431 | } | ||
1432 | #endif | ||
1433 | |||
1434 | ieee->associate_seq = 1; | 1423 | ieee->associate_seq = 1; |
1435 | ieee80211_associate_step1(ieee); | 1424 | ieee80211_associate_step1(ieee); |
1436 | 1425 | ||