aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-08 10:39:14 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 18:46:26 -0500
commite676ae5886c02a5cc48cace5b8e72d44d6e54ee1 (patch)
tree767b32a65864b6562cfd501dd443fd7045f3c469 /drivers/staging/rtl8192e
parent58f6b58ee2a53a0836fa6844d07832a101d10ead (diff)
staging: rtl8192e: Pass priv to IPSEnter
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r--drivers/staging/rtl8192e/r8192E.h2
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 9f15e7785e0..4aefbc3d1fd 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -1127,7 +1127,7 @@ void firmware_init_param(struct net_device *dev);
1127RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len); 1127RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);
1128 1128
1129#ifdef ENABLE_IPS 1129#ifdef ENABLE_IPS
1130void IPSEnter(struct net_device *dev); 1130void IPSEnter(struct r8192_priv *priv);
1131void IPSLeave(struct r8192_priv *priv); 1131void IPSLeave(struct r8192_priv *priv);
1132void IPSLeave_wq(struct work_struct *work); 1132void IPSLeave_wq(struct work_struct *work);
1133void ieee80211_ips_leave_wq(struct net_device *dev); 1133void ieee80211_ips_leave_wq(struct net_device *dev);
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 785045e8db1..93e9e673919 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -3138,10 +3138,8 @@ void LeisurePSLeave(struct net_device *dev)
3138 3138
3139 3139
3140/* Enter the inactive power save mode. RF will be off */ 3140/* Enter the inactive power save mode. RF will be off */
3141void 3141void IPSEnter(struct r8192_priv *priv)
3142IPSEnter(struct net_device *dev)
3143{ 3142{
3144 struct r8192_priv *priv = ieee80211_priv(dev);
3145 PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl; 3143 PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
3146 RT_RF_POWER_STATE rtState; 3144 RT_RF_POWER_STATE rtState;
3147 3145
@@ -3275,7 +3273,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
3275 (priv->eRFPowerState == eRfOn) && !ieee->is_set_key && 3273 (priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&
3276 (!ieee->proto_stoppping) && !ieee->wx_set_enc){ 3274 (!ieee->proto_stoppping) && !ieee->wx_set_enc){
3277 if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){ 3275 if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
3278 IPSEnter(dev); 3276 IPSEnter(priv);
3279 } 3277 }
3280 } 3278 }
3281 } 3279 }