diff options
| author | Mike McCormack | 2011-03-03 14:41:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-03-07 22:31:41 +0100 |
| commit | 4559854d2db145e5c9a7c217f058e7bad706c097 (patch) | |
| tree | 65de2fc13e320dc84b6a73ab14e9c757506a4430 /drivers/staging/rtl8192e/ieee80211 | |
| parent | staging: rtl8192e: Remove pointless hw_sleep_wq (diff) | |
| download | kernel-qcow2-linux-4559854d2db145e5c9a7c217f058e7bad706c097.tar.gz kernel-qcow2-linux-4559854d2db145e5c9a7c217f058e7bad706c097.tar.xz kernel-qcow2-linux-4559854d2db145e5c9a7c217f058e7bad706c097.zip | |
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 8501c4aced6f..8d2b5758d32f 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h @@ -1988,7 +1988,6 @@ struct ieee80211_device { RT_PS_MODE dot11PowerSaveMode; // Power save mode configured. bool actscanning; bool beinretry; - RT_RF_POWER_STATE eRFPowerState; RT_RF_CHANGE_SOURCE RfOffReason; bool is_set_key; //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 2640a4f2e81f..012256c0fc52 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) printk("===>%s(), chan:%d\n", __FUNCTION__, ieee->current_network.channel); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); -#ifdef ENABLE_IPS - if(ieee->eRFPowerState == eRfOff) - { - if(ieee->ieee80211_ips_leave_wq != NULL) - ieee->ieee80211_ips_leave_wq(ieee->dev); - - up(&ieee->wx_sem); - return; - } -#endif - ieee->associate_seq = 1; ieee80211_associate_step1(ieee); |