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

Commit 622d5018 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192su: remove ENABLE_DOT11D ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fe4f699c

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y 
EXTRA_CFLAGS += -DJACKSON_NEW_RX

EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO

#EXTRA_CFLAGS += -DUSE_ONE_PIPE

EXTRA_CFLAGS += -DENABLE_DOT11D



EXTRA_CFLAGS += -DRTL8192SU

EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1

drivers/staging/rtl8192su/ieee80211/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 
EXTRA_CFLAGS += -DRTL8192SU

#EXTRA_CFLAGS += -DJOHN_NOCPY

EXTRA_CFLAGS += -DTHOMAS_TURBO

#flags to enable or disble 80211D feature

EXTRA_CFLAGS += -DENABLE_DOT11D



ieee80211-rsl-objs := ieee80211_rx.o \

		      ieee80211_softmac.o \

		      ieee80211_tx.o \

drivers/staging/rtl8192su/ieee80211/dot11d.c

+0 −2
Original line number Diff line number Diff line 
#ifdef ENABLE_DOT11D

//-----------------------------------------------------------------------------

//	File:

//		Dot11d.c
@@ -227,4 +226,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete); 
EXPORT_SYMBOL(IsLegalChannel);

EXPORT_SYMBOL(ToLegalChannel);

#endif

drivers/staging/rtl8192su/ieee80211/dot11d.h

+0 −4
Original line number Diff line number Diff line 
#ifndef __INC_DOT11D_H

#define __INC_DOT11D_H



#ifdef ENABLE_DOT11D

#include "ieee80211.h"



//#define ENABLE_DOT11D



//#define DOT11D_MAX_CHNL_NUM 83



typedef struct _CHNL_TXPOWER_TRIPLE {
@@ -98,5 +95,4 @@ int ToLegalChannel( 
	struct ieee80211_device * dev,

	u8 channel

);

#endif //ENABLE_DOT11D

#endif // #ifndef __INC_DOT11D_H

drivers/staging/rtl8192su/ieee80211/ieee80211.h

+0 −8
Original line number Diff line number Diff line
@@ -1446,10 +1446,8 @@ struct ieee80211_network { 
#ifdef THOMAS_TURBO

	u8 Turbo_Enable;//enable turbo mode, added by thomas

#endif

#ifdef ENABLE_DOT11D

	u16 CountryIeLen;

	u8 CountryIeBuf[MAX_IE_LEN];

#endif

        // HT Related, by amy, 2008.04.29

	BSS_HT	bssht;

	// Add to handle broadcom AP management frame CCK rate.
@@ -1674,7 +1672,6 @@ typedef u32 RT_RF_CHANGE_SOURCE; 
#define RF_CHANGE_BY_IPS BIT28

#define RF_CHANGE_BY_INIT	0	// Do not change the RFOff reason. Defined by Bruce, 2008-01-17.



#ifdef ENABLE_DOT11D

typedef enum

{

	COUNTRY_CODE_FCC = 0,
@@ -1689,7 +1686,6 @@ typedef enum 
	COUNTRY_CODE_MIC,

	COUNTRY_CODE_GLOBAL_DOMAIN

}country_code_type_t;

#endif

	// Firmware realted CMD IO.

typedef	enum _FW_CMD_IO_TYPE{

	FW_CMD_DIG_ENABLE = 0, // For DIG DM
@@ -1898,12 +1894,8 @@ struct ieee80211_device { 


	/* map of allowed channels. 0 is dummy */

	// FIXME: remeber to default to a basic channel plan depending of the PHY type

#ifdef ENABLE_DOT11D

	void* pDot11dInfo;

	bool bGlobalDomain;

#else

	int channel_map[MAX_CHANNEL_NUMBER+1];

#endif

	int rate;       /* current rate */

	int basic_rate;

	//FIXME: pleace callback, see if redundant with softmac_features