rtl8188eu: Rework CONFIG_NATIVEAP_MLME

This variable is set in autoconf.h to be defined whenever CONFIG_AP is
defined. As there is no need for both parameters, CONFIG_NATIVEAP_MLME is
renamed to CONFIG_AP. In addition, the dead code associated with the one
instance where of _CONFIG_NATIVEAP_MLME_ is removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-20 11:01:46 -05:00
parent 632cdeeec8
commit f4a1669097
10 changed files with 27 additions and 75 deletions

View file

@ -55,8 +55,6 @@
#ifdef CONFIG_INTERRUPT_BASED_TXBCN
#define CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
#endif
#define CONFIG_NATIVEAP_MLME
#endif
#define CONFIG_P2P

View file

@ -46,7 +46,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode);
int rtw_acl_add_sta(_adapter *padapter, u8 *addr);
int rtw_acl_remove_sta(_adapter *padapter, u8 *addr);
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
void associated_clients_update(_adapter *padapter, u8 updated);
void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta);
u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta);

View file

@ -429,7 +429,7 @@ struct mlme_priv {
u8 *wps_probe_req_ie;
u32 wps_probe_req_ie_len;
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
/* Number of associated Non-ERP stations (i.e., stations using 802.11b
* in 802.11g BSS) */
int num_sta_non_erp;
@ -501,7 +501,7 @@ struct mlme_priv {
u8 update_bcn;
#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#endif //#if defined (CONFIG_AP_MODE)
#if defined(CONFIG_WFD) && defined(CONFIG_IOCTL_CFG80211)

View file

@ -175,7 +175,7 @@ struct sta_info {
u8 bpairwise_key_installed;
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
u8 wpa_ie[32];
u8 nonerp_set;
@ -184,7 +184,7 @@ struct sta_info {
u8 no_ht_gf_set;
u8 no_ht_set;
u8 ht_20mhz_set;
#endif // CONFIG_NATIVEAP_MLME
#endif // CONFIG_AP_MODE
unsigned int tx_ra_bitmap;
u8 qos_info;