iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: rtl8821ae: ps.c: Remove version specific code

Browse Source 
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sachin Kamat 2014-05-27 16:02:41 +05:30 committed by Greg Kroah-Hartman
parent aa59f7a526
commit 35722b4141
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/rtl8821ae/ps.c
View File

@ -30,9 +30,7 @@
#include "wifi.h" #include "wifi.h"
#include "base.h" #include "base.h"
#include "ps.h" #include "ps.h"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
#include <linux/export.h> #include <linux/export.h>
#endif
#include "btcoexist/rtl_btc.h" #include "btcoexist/rtl_btc.h"
bool rtl_ps_enable_nic(struct ieee80211_hw *hw) bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
@ -542,17 +540,8 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
tim_len = tim[1]; tim_len = tim[1];
tim_ie = (struct ieee80211_tim_ie *) &tim[2]; tim_ie = (struct ieee80211_tim_ie *) &tim[2];
/*<delete in kernel start>*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
/*<delete in kernel end>*/
if (!WARN_ON_ONCE(!hw->conf.ps_dtim_period)) if (!WARN_ON_ONCE(!hw->conf.ps_dtim_period))
rtlpriv->psc.dtim_counter = tim_ie->dtim_count; rtlpriv->psc.dtim_counter = tim_ie->dtim_count;
/*<delete in kernel start>*/
#else
if (!WARN_ON_ONCE(!mac->vif->bss_conf.dtim_period))
rtlpriv->psc.dtim_counter = tim_ie->dtim_count;
#endif
/*<delete in kernel end>*/
/* Check whenever the PHY can be turned off again. */ /* Check whenever the PHY can be turned off again. */
@ -656,9 +645,6 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
* time to sleep_intv = rtlpriv->psc.dtim_counter or * time to sleep_intv = rtlpriv->psc.dtim_counter or
* MAX_SW_LPS_SLEEP_INTV(default set to 5) */ * MAX_SW_LPS_SLEEP_INTV(default set to 5) */
/*<delete in kernel start>*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
/*<delete in kernel end>*/
if (rtlpriv->psc.dtim_counter == 0) { if (rtlpriv->psc.dtim_counter == 0) {
if (hw->conf.ps_dtim_period == 1) if (hw->conf.ps_dtim_period == 1)
sleep_intv = hw->conf.ps_dtim_period * 2; sleep_intv = hw->conf.ps_dtim_period * 2;
@ -667,18 +653,6 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
} else { } else {
sleep_intv = rtlpriv->psc.dtim_counter; sleep_intv = rtlpriv->psc.dtim_counter;
} }
/*<delete in kernel start>*/
#else
if (rtlpriv->psc.dtim_counter == 0) {
if (mac->vif->bss_conf.dtim_period == 1)
sleep_intv = mac->vif->bss_conf.dtim_period * 2;
else
sleep_intv = mac->vif->bss_conf.dtim_period;
} else {
sleep_intv = rtlpriv->psc.dtim_counter;
}
#endif
/*<delete in kernel end>*/
if (sleep_intv > MAX_SW_LPS_SLEEP_INTV) if (sleep_intv > MAX_SW_LPS_SLEEP_INTV)
sleep_intv = MAX_SW_LPS_SLEEP_INTV; sleep_intv = MAX_SW_LPS_SLEEP_INTV;