summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtl_core.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-13 09:35:45 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-23 20:33:14 -0500
commit2b259bd38fdfdf6a4103234172eafc13d7f774b6 (patch)
treee65e14a6f6b636e263d0f8efc90585aac5a76dd1 /drivers/staging/rtl8192e/rtl_core.c
parent5b774ec296657f219890adb274e7455ec2e21af6 (diff)
downloadop-kernel-dev-2b259bd38fdfdf6a4103234172eafc13d7f774b6.zip
op-kernel-dev-2b259bd38fdfdf6a4103234172eafc13d7f774b6.tar.gz
staging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D
This configuration parameter is selected in the Makefile, thus the conditional code can be removed. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl_core.c')
-rw-r--r--drivers/staging/rtl8192e/rtl_core.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index 062e19b..9385004 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -1347,7 +1347,6 @@ short rtl8192_get_channel_map(struct net_device * dev)
{
int i;
-#ifdef ENABLE_DOT11D
struct r8192_priv *priv = rtllib_priv(dev);
if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256)
&& (priv->rf_chip != RF_6052)) {
@@ -1364,23 +1363,6 @@ short rtl8192_get_channel_map(struct net_device * dev)
#ifndef CONFIG_CRDA
Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
#endif
-#else
- struct r8192_priv *priv = rtllib_priv(dev);
- int ch;
- if (!channels){
- DMESG("No channels, aborting");
- return -1;
- }
-
- ch = channels;
- priv->ChannelPlan = 0;
- for (i = 1; i <= 14; i++) {
- (priv->rtllib->channel_map)[i] = (u8)(ch & 0x01);
- ch >>= 1;
- }
- priv->rtllib->IbssStartChnl= 10;
- priv->rtllib->ibss_maxjoin_chal = 11;
-#endif
for (i = 1; i <= 11; i++) {
(priv->rtllib->active_channel_map)[i] = 1;
}
OpenPOWER on IntegriCloud