Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f6b58e authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Pass priv to IPSLeave 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e2617486

drivers/staging/rtl8192e/r8192E.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8192e/r8192E_core.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

			}

		}

drivers/staging/rtl8192e/r8192E_wx.c

+6 −6
Original line number Diff line number Diff line
@@ -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