Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b259bd3 authored by Larry Finger's avatar Larry Finger
Browse files

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 5b774ec2

drivers/staging/rtl8192e/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ ccflags-y += -DEEPROM_OLD_FORMAT_SUPPORT=1 
ccflags-y += -DUSE_FW_SOURCE_IMG_FILE

ccflags-y += -DCONFIG_PM_RTL

ccflags-y += -DCONFIG_PM

ccflags-y += -DENABLE_DOT11D

ccflags-y += -DHAVE_NET_DEVICE_OPS

ccflags-y += -DENABLE_DOT11D

drivers/staging/rtl8192e/r8192E_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -609,9 +609,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) 


	if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)

		priv->ChannelPlan = 0;

#ifdef ENABLE_DOT11D

	priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;

#endif



	if ( priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)

		priv->rtllib->bSupportRemoteWakeUp = true;

drivers/staging/rtl8192e/r8192E_phy.c

+0 −4
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
#include "r8190P_rtl8256.h"

#include "r8192E_phy.h"

#include "rtl_dm.h"

#ifdef ENABLE_DOT11D

#include "dot11d.h"

#endif



#include "r8192E_hwimg.h"
@@ -871,13 +869,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u 


	RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n", __func__, *stage, *step, channel);



#ifdef ENABLE_DOT11D

	if (!IsLegalChannel(priv->rtllib, channel))

	{

		RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel);

		return true;

	}

#endif



	{

		PreCommonCmdCnt = 0;

drivers/staging/rtl8192e/rtl_core.c

+0 −18
Original line number Diff line number Diff line
@@ -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)) {
@@ -1363,23 +1362,6 @@ short rtl8192_get_channel_map(struct net_device * dev) 
	Dot11d_Init(priv->rtllib);

#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;

drivers/staging/rtl8192e/rtl_core.h

+0 −2
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ 
#include <asm/io.h>

#include "rtllib.h"



#ifdef ENABLE_DOT11D

#include "dot11d.h"

#endif



#include "r8192E_firmware.h"

#include "r8192E_hw.h"