diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-13 14:35:45 (GMT) |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:33:14 (GMT) |
| commit | 2b259bd38fdfdf6a4103234172eafc13d7f774b6 (patch) | |
| tree | e65e14a6f6b636e263d0f8efc90585aac5a76dd1 /drivers/staging/rtl8192e/rtllib_rx.c | |
| parent | 5b774ec296657f219890adb274e7455ec2e21af6 (diff) | |
| download | linux-fsl-qoriq-2b259bd38fdfdf6a4103234172eafc13d7f774b6.tar.xz | |
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/rtllib_rx.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_rx.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 7e0faba..10ec50c 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -43,9 +43,7 @@ #include <linux/ctype.h> #include "rtllib.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif #if defined CONFIG_CFG_80211 #include <linux/crc32.h> @@ -2074,7 +2072,6 @@ static const char *get_info_element_string(u16 id) } #endif -#ifdef ENABLE_DOT11D static inline void rtllib_extract_country_ie( struct rtllib_device *ieee, struct rtllib_info_element *info_element, @@ -2100,7 +2097,6 @@ static inline void rtllib_extract_country_ie( } } -#endif int rtllib_parse_info_param(struct rtllib_device *ieee, struct rtllib_info_element *info_element, @@ -2574,13 +2570,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, "QoS Error need to parse QOS_PARAMETER IE\n"); break; -#ifdef ENABLE_DOT11D case MFIE_TYPE_COUNTRY: RTLLIB_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n", info_element->len); rtllib_extract_country_ie(ieee, info_element, network, network->bssid); break; -#endif /* TODO */ default: RTLLIB_DEBUG_MGMT @@ -2717,10 +2711,8 @@ static inline int rtllib_network_init( network->Turbo_Enable = 0; network->SignalStrength = stats->SignalStrength; network->RSSI = stats->SignalStrength; -#ifdef ENABLE_DOT11D network->CountryIeLen = 0; memset(network->CountryIeBuf, 0, MAX_IE_LEN); -#endif HTInitializeBssDesc(&network->bssht); if (stats->freq == RTLLIB_52GHZ_BAND) { /* for A band (No DS info) */ @@ -2898,10 +2890,8 @@ static inline void update_network(struct rtllib_network *dst, dst->RSSI = src->RSSI; dst->Turbo_Enable = src->Turbo_Enable; -#ifdef ENABLE_DOT11D dst->CountryIeLen = src->CountryIeLen; memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); -#endif dst->bWithAironetIE = src->bWithAironetIE; dst->bCkipSupported = src->bCkipSupported; |