diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-13 20:01:38 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:41 -0700 |
commit | f5ce8fe1fd256bc7f32d13aba83145e559a76942 (patch) | |
tree | bd5fa67da9e058be22587e38485ce505715ba929 /drivers/staging/rtl8187se/r8180_core.c | |
parent | 343c17b0508586a5624ebce490c619064e51cc03 (diff) |
Staging: rtl8187se: remove ENABLE_IPS ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_core.c')
-rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 08e00347bb6..18292d497b3 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -3598,13 +3598,11 @@ void rtl8180_watch_dog(struct net_device *dev) u32 TotalRxNum = 0; u16 SlotIndex = 0; u16 i = 0; -#ifdef ENABLE_IPS if(priv->ieee80211->actscanning == false){ if((priv->ieee80211->iw_mode != IW_MODE_ADHOC) && (priv->ieee80211->state == IEEE80211_NOLINK) && (priv->ieee80211->beinretry == false) && (priv->eRFPowerState == eRfOn)){ IPSEnter(dev); } } -#endif //YJ,add,080828,for link state check if((priv->ieee80211->state == IEEE80211_LINKED) && (priv->ieee80211->iw_mode == IW_MODE_INFRA)){ SlotIndex = (priv->link_detect.SlotIndex++) % priv->link_detect.SlotNum; @@ -3667,12 +3665,10 @@ int _rtl8180_up(struct net_device *dev) rtl8185b_adapter_start(dev); rtl8185b_rx_enable(dev); rtl8185b_tx_enable(dev); -#ifdef ENABLE_IPS if(priv->bInactivePs){ if(priv->ieee80211->iw_mode == IW_MODE_ADHOC) IPSLeave(dev); } -#endif #ifdef RATE_ADAPT timer_rate_adaptive((unsigned long)dev); #endif |