[PATCH 04/14] rtl8192e: Pass priv to IPSLeave
Mike McCormack
mikem at ring3k.org
Tue Mar 8 15:39:05 UTC 2011
Signed-off-by: Mike McCormack <mikem at ring3k.org>
---
drivers/staging/rtl8192e/r8192E.h | 2 +-
drivers/staging/rtl8192e/r8192E_core.c | 10 ++++------
drivers/staging/rtl8192e/r8192E_wx.c | 12 ++++++------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 2b70d0d..9f15e77 100644
--- 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 ee1fb00..785045e 100644
--- 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 57d97ad..2d20b9a 100644
--- 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
--
1.7.0.4
More information about the devel
mailing list