staging: rtl8192e: Pass priv to IPSLeave

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 2b70d0d4985d95f9721e9975aaf0c1aa91799ca6..9f15e7785e0b7469afd7c22b1c517d5280520ae1 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -1128,7 +1128,7 @@ RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress,
 
 #ifdef ENABLE_IPS
 void IPSEnter(struct net_device *dev);
-void IPSLeave(struct net_device *dev);
+void IPSLeave(struct r8192_priv *priv);
 void IPSLeave_wq(struct work_struct *work);
 void ieee80211_ips_leave_wq(struct net_device *dev);
 void ieee80211_ips_leave(struct net_device *dev);

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index ee1fb007abdc1055367b0eb1629934d971fb8ce0..785045e8db1ea07cab3414ff564e410990510e7a 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -3173,10 +3173,8 @@ IPSEnter(struct net_device *dev)
 //             Leave the inactive power save mode, RF will be on.
 //     2007.08.17, by shien chang.
 //
-void
-IPSLeave(struct net_device *dev)
+void IPSLeave(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
        RT_RF_POWER_STATE       rtState;
 
@@ -3199,7 +3197,7 @@ void IPSLeave_wq(struct work_struct *work)
 
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        down(&priv->ieee80211->ips_sem);
-       IPSLeave(dev);
+       IPSLeave(priv);
        up(&priv->ieee80211->ips_sem);
 }
 
@@ -3228,7 +3226,7 @@ void ieee80211_ips_leave(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        down(&priv->ieee80211->ips_sem);
-       IPSLeave(dev);
+       IPSLeave(priv);
        up(&priv->ieee80211->ips_sem);
 }
 #endif
@@ -4981,7 +4979,7 @@ void setKey(      struct net_device *dev,
                        }
                        else{
                                down(&priv->ieee80211->ips_sem);
-                               IPSLeave(dev);
+                               IPSLeave(priv);
                                up(&priv->ieee80211->ips_sem);
                        }
                }

diff --git a/drivers/staging/rtl8192e/r8192E_wx.c b/drivers/staging/rtl8192e/r8192E_wx.c
index 57d97adf125994eac612fb5e6eb0c1cc4176f9d7..2d20b9a9a2877078120ed6f672b2dbcd9d424a4f 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_wx.c
+++ b/drivers/staging/rtl8192e/r8192E_wx.c
@@ -231,7 +231,7 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
                                else{
                                        RT_TRACE(COMP_ERR, "%s(): IPSLeave\n",__FUNCTION__);
                                        down(&priv->ieee80211->ips_sem);
-                                       IPSLeave(dev);
+                                       IPSLeave(priv);
                                        up(&priv->ieee80211->ips_sem);
                                }
                        }
@@ -417,7 +417,7 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
                                else{
                                        //RT_TRACE(COMP_PS, "%s(): IPSLeave\n",__FUNCTION__);
                                        down(&priv->ieee80211->ips_sem);
-                                       IPSLeave(dev);
+                                       IPSLeave(priv);
                                        up(&priv->ieee80211->ips_sem);
                                }
                        }
@@ -480,7 +480,7 @@ static int r8192_wx_set_essid(struct net_device *dev,
 
 #ifdef ENABLE_IPS
         down(&priv->ieee80211->ips_sem);
-        IPSLeave(dev);
+        IPSLeave(priv);
         up(&priv->ieee80211->ips_sem);
 #endif
        ret = ieee80211_wx_set_essid(priv->ieee80211,a,wrqu,b);
@@ -590,7 +590,7 @@ static int r8192_wx_set_wap(struct net_device *dev,
 
 #ifdef ENABLE_IPS
         down(&priv->ieee80211->ips_sem);
-        IPSLeave(dev);
+        IPSLeave(priv);
         up(&priv->ieee80211->ips_sem);
 #endif
        ret = ieee80211_wx_set_wap(priv->ieee80211,info,awrq,extra);
@@ -647,7 +647,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
         priv->ieee80211->wx_set_enc = 1;
 #ifdef ENABLE_IPS
         down(&priv->ieee80211->ips_sem);
-        IPSLeave(dev);
+        IPSLeave(priv);
         up(&priv->ieee80211->ips_sem);
 #endif
 
@@ -869,7 +869,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
 
 #ifdef ENABLE_IPS
         down(&priv->ieee80211->ips_sem);
-        IPSLeave(dev);
+        IPSLeave(priv);
         up(&priv->ieee80211->ips_sem);
 #endif