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

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

staging: rtl8192e: Pass priv to IPSEnter 



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

drivers/staging/rtl8192e/r8192E.h

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

RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);





#ifdef ENABLE_IPS

#ifdef ENABLE_IPS

void IPSEnter(struct net_device *dev);

void IPSEnter(struct r8192_priv *priv);

void IPSLeave(struct r8192_priv *priv);

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);

drivers/staging/rtl8192e/r8192E_core.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -3138,10 +3138,8 @@ void LeisurePSLeave(struct net_device *dev) 








/* Enter the inactive power save mode. RF will be off */

/* Enter the inactive power save mode. RF will be off */

void

void IPSEnter(struct r8192_priv *priv)

IPSEnter(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;
@@ -3275,7 +3273,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
		    (priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&

		    (priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&

		    (!ieee->proto_stoppping) && !ieee->wx_set_enc){

		    (!ieee->proto_stoppping) && !ieee->wx_set_enc){

			if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){

			if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){

				IPSEnter(dev);

				IPSEnter(priv);

			}

			}

		}

		}

	}

	}