evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8192e: Rename LeisurePSLeave

Browse source 
Use naming schema found in other rtlwifi devices.
Rename LeisurePSLeave to rtl92e_leisure_ps_leave.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-07-19 19:33:50 +02:00 • committed by Greg Kroah-Hartman
parent 04197ef2bd
commit 9c4a55d1da
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View file

@ -811,7 +811,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
priv->rtllib->rtllib_ips_leave(dev); priv->rtllib->rtllib_ips_leave(dev);
if (priv->rtllib->state == RTLLIB_LINKED) if (priv->rtllib->state == RTLLIB_LINKED)
LeisurePSLeave(dev); rtl92e_leisure_ps_leave(dev);
priv->bDriverIsGoingToUnload = true; priv->bDriverIsGoingToUnload = true;
priv->up = 0; priv->up = 0;
@ -875,7 +875,7 @@ static void rtl8192_init_priv_handler(struct net_device *dev)
priv->rtllib->handle_assoc_response = rtl8192_handle_assoc_response; priv->rtllib->handle_assoc_response = rtl8192_handle_assoc_response;
priv->rtllib->handle_beacon = rtl8192_handle_beacon; priv->rtllib->handle_beacon = rtl8192_handle_beacon;
priv->rtllib->SetWirelessMode = rtl92e_set_wireless_mode; priv->rtllib->SetWirelessMode = rtl92e_set_wireless_mode;
priv->rtllib->LeisurePSLeave = LeisurePSLeave; priv->rtllib->LeisurePSLeave = rtl92e_leisure_ps_leave;
priv->rtllib->SetBWModeHandler = rtl92e_set_bw_mode; priv->rtllib->SetBWModeHandler = rtl92e_set_bw_mode;
priv->rf_set_chan = rtl92e_set_channel; priv->rf_set_chan = rtl92e_set_channel;
@ -1282,7 +1282,7 @@ RESET_START:
down(&priv->wx_sem); down(&priv->wx_sem);
if (priv->rtllib->state == RTLLIB_LINKED) if (priv->rtllib->state == RTLLIB_LINKED)
LeisurePSLeave(dev); rtl92e_leisure_ps_leave(dev);
if (priv->up) { if (priv->up) {
netdev_info(dev, "%s():the driver is not up.\n", netdev_info(dev, "%s():the driver is not up.\n",
@ -1484,11 +1484,11 @@ static void rtl819x_watchdog_wqcallback(void *data)
if (bEnterPS) if (bEnterPS)
rtl92e_leisure_ps_enter(dev); rtl92e_leisure_ps_enter(dev);
else else
LeisurePSLeave(dev); rtl92e_leisure_ps_leave(dev);
} else { } else {
RT_TRACE(COMP_LPS, "====>no link LPS leave\n"); RT_TRACE(COMP_LPS, "====>no link LPS leave\n");
LeisurePSLeave(dev); rtl92e_leisure_ps_leave(dev);
} }
ieee->LinkDetectInfo.NumRxOkInPeriod = 0; ieee->LinkDetectInfo.NumRxOkInPeriod = 0;

6
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
View file

@ -291,21 +291,21 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
} }
} }
void LeisurePSLeave(struct net_device *dev) void rtl92e_leisure_ps_leave(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
&(priv->rtllib->PowerSaveControl); &(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "LeisurePSLeave()...\n"); RT_TRACE(COMP_PS, "rtl92e_leisure_ps_leave()...\n");
RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n", RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n",
pPSC->bLeisurePs, priv->rtllib->ps); pPSC->bLeisurePs, priv->rtllib->ps);
if (pPSC->bLeisurePs) { if (pPSC->bLeisurePs) {
if (priv->rtllib->ps != RTLLIB_PS_DISABLED) { if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, RT_TRACE(COMP_LPS,
"LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n"); "rtl92e_leisure_ps_leave(): Busy Traffic , Leave 802.11 power save..\n");
MgntActSet_802_11_PowerSaveMode(dev, MgntActSet_802_11_PowerSaveMode(dev,
RTLLIB_PS_DISABLED); RTLLIB_PS_DISABLED);

2
drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
View file

@ -41,6 +41,6 @@ void rtl92e_ips_enter(struct net_device *dev);
void rtl92e_ips_leave(struct net_device *dev); void rtl92e_ips_leave(struct net_device *dev);
void rtl92e_leisure_ps_enter(struct net_device *dev); void rtl92e_leisure_ps_enter(struct net_device *dev);
void LeisurePSLeave(struct net_device *dev); void rtl92e_leisure_ps_leave(struct net_device *dev);
#endif #endif

2
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
View file

@ -192,7 +192,7 @@ static int r8192_wx_adapter_power_status(struct net_device *dev,
pPSC->bLeisurePs = true; pPSC->bLeisurePs = true;
} else { } else {
if (priv->rtllib->state == RTLLIB_LINKED) if (priv->rtllib->state == RTLLIB_LINKED)
LeisurePSLeave(dev); rtl92e_leisure_ps_leave(dev);
priv->ps_force = true; priv->ps_force = true;
pPSC->bLeisurePs = false; pPSC->bLeisurePs = false;