aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtl_dm.c
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-07-11 08:56:20 +0900
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-23 20:03:54 -0500
commit4f6807e8d2e972393009830d305ecec2d80c0449 (patch)
treea1f1bf47b8bc0859636f17bcdf56e513984df89f /drivers/staging/rtl8192e/rtl_dm.c
parentrtl8192e: Remove WIRELESS_EXT macro checks (diff)
downloadlinux-dev-4f6807e8d2e972393009830d305ecec2d80c0449.tar.xz
linux-dev-4f6807e8d2e972393009830d305ecec2d80c0449.zip
rtl8192e: Remove occurences of #if 1
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl_dm.c')
-rw-r--r--drivers/staging/rtl8192e/rtl_dm.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c
index e864acb2c0b1..9f32e30f3191 100644
--- a/drivers/staging/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl_dm.c
@@ -469,10 +469,8 @@ static void dm_check_rate_adaptive(struct net_device * dev)
}
}
-#if 1
if (priv->rtllib->GetHalfNmodeSupportByAPsHandler(dev))
targetRATR &= 0xf00fffff;
-#endif
currentRATR = read_nic_dword(dev, RATR0);
if ( targetRATR != currentRATR )
@@ -2983,7 +2981,6 @@ extern void dm_init_edca_turbo(struct net_device * dev)
priv->bis_cur_rdlstate = false;
}
-#if 1
static void dm_check_edca_turbo(
struct net_device * dev)
{
@@ -3086,7 +3083,6 @@ dm_CheckEdcaTurbo_EXIT:
lastTxOkCnt = priv->stats.txbytesunicast;
lastRxOkCnt = priv->stats.rxbytesunicast;
}
-#endif
extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value)
{
@@ -3138,18 +3134,7 @@ static void dm_ctstoself(struct net_device *dev)
}
else
{
- #if 1
pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;
- #else
- if (priv->undecorated_smoothed_pwdb < priv->rtllib->CTSToSelfTH)
- {
- pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
- }
- else if (priv->undecorated_smoothed_pwdb >= (priv->rtllib->CTSToSelfTH+5))
- {
- pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;
- }
- #endif
}
lastTxOkCnt = priv->stats.txbytesunicast;