skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_LPS

Browse source 
This symbol is defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-24 20:32:00 -06:00
parent e932bd9250
commit dae15933ce
13 changed files with 4 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/rtw_cmd.c
View file

@ -678,13 +678,9 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif /* CONFIG_P2P */
;
#ifdef CONFIG_LPS
if(check_fwstate(pmlmepriv, _FW_LINKED) == true){
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
}
#endif
#ifdef CONFIG_P2P_PS
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
@ -2044,9 +2040,7 @@ exit:
static void traffic_status_watchdog(struct adapter *padapter)
{
#ifdef CONFIG_LPS
u8 bEnterPS;
#endif
u16 BusyThreshold = 200;/* 100; */
u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
@ -2134,7 +2128,6 @@ static void traffic_status_watchdog(struct adapter *padapter)
#endif /* CONFIG_TDLS_AUTOSETUP */
#endif /* CONFIG_TDLS */
#ifdef CONFIG_LPS
#ifdef CONFIG_BT_COEXIST
if (BT_1Ant(padapter) == false)
#endif
@ -2161,13 +2154,10 @@ static void traffic_status_watchdog(struct adapter *padapter)
LPS_Leave(padapter);
}
}
#endif /* CONFIG_LPS */
}
else
{
#ifdef CONFIG_LPS
LPS_Leave(padapter);
#endif
}
pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0;
@ -2218,9 +2208,6 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
#endif
}
#ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -2347,8 +2334,6 @@ exit:
}
#endif
#if (RATE_ADAPTIVE_SUPPORT==1)
static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime)
{
@ -2790,11 +2775,9 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
case POWER_SAVING_CTRL_WK_CID:
power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
break;
#ifdef CONFIG_LPS
case LPS_CTRL_WK_CID:
lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);
break;
#endif
#if (RATE_ADAPTIVE_SUPPORT==1)
case RTP_TIMER_CFG_WK_CID:
rpt_timer_setting_wk_hdl(padapter, pdrvextra_cmd->type_size);

16
core/rtw_ioctl_set.c
View file

@ -338,8 +338,7 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
("Set SSID is the same ssid, fw_state=0x%08x\n",
get_fwstate(pmlmepriv)));
if(rtw_is_same_ibss(padapter, pnetwork) == false)
{
if(rtw_is_same_ibss(padapter, pnetwork) == false) {
/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */
rtw_disassoc_cmd(padapter, 0, true);
@ -352,20 +351,13 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
}
}
else
{
} else {
goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */
}
}
#ifdef CONFIG_LPS
else {
} else {
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_JOINBSS, 1);
}
#endif
}
else
{
} else {
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set SSID not the same ssid\n"));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength));

4
core/rtw_mlme.c
View file

@ -1488,11 +1488,7 @@ void rtw_indicate_disconnect( struct adapter *padapter )
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
#endif /* CONFIG_P2P_PS */
#ifdef CONFIG_LPS
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
#endif
;
}
inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted)

3
core/rtw_mlme_ext.c
View file

@ -9606,10 +9606,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
/* set_link_timer(pmlmeext, DISCONNECT_TO); */
}
#ifdef CONFIG_LPS
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
#endif
exit_mlmeext_joinbss_event_callback:

8
core/rtw_pwrctrl.c
View file

@ -322,7 +322,6 @@ static void pwr_state_check_handler(void *FunctionContext)
rtw_ps_cmd(padapter);
}
#ifdef CONFIG_LPS
/*
*
* Parameters
@ -704,12 +703,7 @@ void LPS_Leave(struct adapter *padapter)
}
pwrpriv->bpower_saving = false;
/* DBG_871X("-LeisurePSLeave\n"); */
;
}
#endif
/* */
/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
@ -729,9 +723,7 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
#endif /* CONFIG_P2P_PS */
#ifdef CONFIG_LPS
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
#endif
} else {
if(adapter_to_pwrctl(Adapter)->rf_pwrstate== rf_off)
{

2
core/rtw_xmit.c
View file

@ -683,7 +683,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
rtw_set_scan_deny(padapter, 3000);
}
#ifdef CONFIG_LPS
/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
#ifdef CONFIG_WAPI_SUPPORT
if ( (pattrib->ether_type == 0x88B4) || (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
@ -693,7 +692,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
{
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
}
#endif
bmcast = IS_MCAST(pattrib->ra);