From: Mike McCormack <mikem@ring3k.org>
Date: Tue, 8 Mar 2011 15:39:14 +0000 (+0900)
Subject: staging: rtl8192e: Pass priv to IPSEnter
X-Git-Tag: firefly_0821_release~7613^2~2197^2~213
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e676ae5886c02a5cc48cace5b8e72d44d6e54ee1;p=firefly-linux-kernel-4.4.55.git

staging: rtl8192e: Pass priv to IPSEnter

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 9f15e7785e0b..4aefbc3d1fdb 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);
 RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);
 
 #ifdef ENABLE_IPS
-void IPSEnter(struct net_device *dev);
+void IPSEnter(struct r8192_priv *priv);
 void IPSLeave(struct r8192_priv *priv);
 void IPSLeave_wq(struct work_struct *work);
 void 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 785045e8db1e..93e9e673919b 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)
 
 
 /* Enter the inactive power save mode. RF will be off */
-void
-IPSEnter(struct net_device *dev)
+void IPSEnter(struct r8192_priv *priv)
 {
-	struct r8192_priv *priv = ieee80211_priv(dev);
 	PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 	RT_RF_POWER_STATE 			rtState;
 
@@ -3275,7 +3273,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 		    (priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&
 		    (!ieee->proto_stoppping) && !ieee->wx_set_enc){
 			if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
-				IPSEnter(dev);
+				IPSEnter(priv);
 			}
 		}
 	}