hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8192e: Pass priv to IPSLeave 

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2011-03-09 00:39:05 +09:00 committed by Greg Kroah-Hartman
parent e26174864a
commit 58f6b58ee2
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rtl8192e/r8192E.h
View File

@ -1128,7 +1128,7 @@ RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress,
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
void IPSEnter(struct net_device *dev); 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 IPSLeave_wq(struct work_struct *work);
void ieee80211_ips_leave_wq(struct net_device *dev); void ieee80211_ips_leave_wq(struct net_device *dev);
void ieee80211_ips_leave(struct net_device *dev); void ieee80211_ips_leave(struct net_device *dev);

10
drivers/staging/rtl8192e/r8192E_core.c
View File

@ -3173,10 +3173,8 @@ IPSEnter(struct net_device *dev)
// Leave the inactive power save mode, RF will be on. // Leave the inactive power save mode, RF will be on.
// 2007.08.17, by shien chang. // 2007.08.17, by shien chang.
// //
void void IPSLeave(struct r8192_priv *priv)
IPSLeave(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev);
PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl; PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
RT_RF_POWER_STATE rtState; 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); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); 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); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
} }
#endif #endif
@ -4981,7 +4979,7 @@ void setKey( struct net_device *dev,
} }
else{ else{
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
} }
} }

12
drivers/staging/rtl8192e/r8192E_wx.c
View File

@ -231,7 +231,7 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
else{ else{
RT_TRACE(COMP_ERR, "%s(): IPSLeave\n",__FUNCTION__); RT_TRACE(COMP_ERR, "%s(): IPSLeave\n",__FUNCTION__);
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); 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{ else{
//RT_TRACE(COMP_PS, "%s(): IPSLeave\n",__FUNCTION__); //RT_TRACE(COMP_PS, "%s(): IPSLeave\n",__FUNCTION__);
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
} }
} }
@ -480,7 +480,7 @@ static int r8192_wx_set_essid(struct net_device *dev,
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
#endif #endif
ret = ieee80211_wx_set_essid(priv->ieee80211,a,wrqu,b); 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 #ifdef ENABLE_IPS
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
#endif #endif
ret = ieee80211_wx_set_wap(priv->ieee80211,info,awrq,extra); 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; priv->ieee80211->wx_set_enc = 1;
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
#endif #endif
@ -869,7 +869,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
down(&priv->ieee80211->ips_sem); down(&priv->ieee80211->ips_sem);
IPSLeave(dev); IPSLeave(priv);
up(&priv->ieee80211->ips_sem); up(&priv->ieee80211->ips_sem);
#endif #endif