From dae15933ceca523094bf7b2ea30bf3b91940742c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 24 Feb 2015 20:32:00 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_LPS This symbol is defined. Signed-off-by: Larry Finger --- core/rtw_cmd.c | 17 ----------------- core/rtw_ioctl_set.c | 16 ++++------------ core/rtw_mlme.c | 4 ---- core/rtw_mlme_ext.c | 3 --- core/rtw_pwrctrl.c | 8 -------- core/rtw_xmit.c | 2 -- hal/odm.c | 2 -- hal/rtl8188e_dm.c | 2 -- include/autoconf.h | 2 -- include/rtw_pwrctrl.h | 2 -- os_dep/ioctl_cfg80211.c | 3 --- os_dep/ioctl_linux.c | 13 ------------- os_dep/usb_intf.c | 2 -- 13 files changed, 4 insertions(+), 72 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index dea22fd..b312598 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -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); diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index dd0b09b..07274e0 100755 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -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)); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 0895a9e..ebc403c 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -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) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 84e6641..7651e85 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -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: diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 7588fea..e59fbdb 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -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) { diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 6e7201c..cc73249 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -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); diff --git a/hal/odm.c b/hal/odm.c index 4436c73..aba753c 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -1226,9 +1226,7 @@ odm_DIGbyRSSI_LPS( return; CurrentIGI=CurrentIGI+RSSI_OFFSET_DIG; -#ifdef CONFIG_LPS bFwCurrentInPSMode = adapter_to_pwrctl(pAdapter)->bFwCurrentInPSMode; -#endif ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("==>pDM_Odm->RSSI_Min=%d ()\n",pDM_Odm->RSSI_Min)); diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index ac90ce2..38f48f7 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -308,10 +308,8 @@ rtl8188e_HalDmWatchDog( if (hw_init_completed == false) goto skip_dm; -#ifdef CONFIG_LPS bFwCurrentInPSMode = adapter_to_pwrctl(Adapter)->bFwCurrentInPSMode; rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); -#endif #ifdef CONFIG_P2P_PS /* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */ diff --git a/include/autoconf.h b/include/autoconf.h index db6b2e3..1041e7c 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -32,8 +32,6 @@ #define CONFIG_SUPPORT_USB_INT - #define CONFIG_LPS - //befor link #define CONFIG_ANTENNA_DIVERSITY diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index 811ba13..071dec1 100755 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -314,11 +314,9 @@ int autoresume_enter(struct adapter* padapter); #endif rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ); -#ifdef CONFIG_LPS s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms); void LPS_Enter(struct adapter *padapter); void LPS_Leave(struct adapter *padapter); -#endif #ifdef CONFIG_RESUME_IN_WORKQUEUE void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv); diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 2945104..7ec4dfb 100755 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -3035,11 +3035,8 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy, rtw_wdev_priv->power_mgmt = enabled; - #ifdef CONFIG_LPS if (!enabled) LPS_Leave(padapter); - #endif - return 0; } diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index ebb6f34..3b17530 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -8213,9 +8213,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, rtw_stop_drv_threads(padapter); padapter->bDriverStopped = false; /* for 32k command */ -#ifdef CONFIG_LPS rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); -#endif rtw_hal_disable_interrupt(padapter); /* It need wait for leaving 32K. */ /* 2.1 clean interupt */ @@ -8226,9 +8224,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, rtw_hal_set_hwreg(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); } else if (_rtw_memcmp( extra, "disable", 6 )) { -#ifdef CONFIG_LPS rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); -#endif /* CONFIG_LPS */ pwrctrlpriv->bFwCurrentInPSMode = false; rtw_hal_disable_interrupt(padapter); @@ -8344,10 +8340,8 @@ static int rtw_mp_efuse_get(struct net_device *dev, err = -EFAULT; goto exit; } - #ifdef CONFIG_LPS lps_mode = pwrctrlpriv->power_mgnt;/* keep org value */ rtw_pm_set_lps(padapter,PS_MODE_ACTIVE); - #endif ips_mode = pwrctrlpriv->ips_mode;/* keep org value */ rtw_pm_set_ips(padapter,IPS_NONE); @@ -8834,9 +8828,7 @@ exit: wrqu->length = strlen(extra); rtw_pm_set_ips(padapter, ips_mode); - #ifdef CONFIG_LPS rtw_pm_set_lps(padapter, lps_mode); - #endif #ifdef CONFIG_IOL padapter->registrypriv.fw_iol = org_fw_iol;/* 0:Disable, 1:enable, 2:by usb speed */ #endif @@ -8895,10 +8887,8 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - #ifdef CONFIG_LPS lps_mode = pwrctrlpriv->power_mgnt;/* keep org value */ rtw_pm_set_lps(padapter,PS_MODE_ACTIVE); - #endif ips_mode = pwrctrlpriv->ips_mode;/* keep org value */ rtw_pm_set_ips(padapter,IPS_NONE); @@ -9279,10 +9269,7 @@ exit: rtw_mfree(setrawdata, EFUSE_MAX_SIZE); rtw_pm_set_ips(padapter, ips_mode); - #ifdef CONFIG_LPS rtw_pm_set_lps(padapter, lps_mode); - #endif - return err; } diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 4faf47a..c8b7e16 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -592,10 +592,8 @@ int rtw_hw_suspend(struct adapter *padapter ) rtw_os_indicate_disconnect(padapter); - #ifdef CONFIG_LPS /* donnot enqueue cmd */ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); - #endif } }