Skip to content

Commit

Permalink
staging: rtl8192e: Pass priv to IPSEnter
Browse files Browse the repository at this point in the history
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Mar 9, 2011
1 parent 58f6b58 commit e676ae5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192e/r8192E.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

#ifdef ENABLE_IPS
void IPSEnter(struct net_device *dev);
void IPSEnter(struct r8192_priv *priv);
void IPSLeave(struct r8192_priv *priv);
void IPSLeave_wq(struct work_struct *work);
void ieee80211_ips_leave_wq(struct net_device *dev);
Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3138,10 +3138,8 @@ void LeisurePSLeave(struct net_device *dev)


/* Enter the inactive power save mode. RF will be off */
void
IPSEnter(struct net_device *dev)
void IPSEnter(struct r8192_priv *priv)
{
struct r8192_priv *priv = ieee80211_priv(dev);
PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
RT_RF_POWER_STATE rtState;

Expand Down Expand Up @@ -3275,7 +3273,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
(priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&
(!ieee->proto_stoppping) && !ieee->wx_set_enc){
if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
IPSEnter(dev);
IPSEnter(priv);
}
}
}
Expand Down

0 comments on commit e676ae5

Please sign in to comment.