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

@ -122,7 +122,7 @@ static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)
void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
{
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len);
rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len);
rtw_free_mlme_ie_data(&pmlmepriv->wps_beacon_ie, &pmlmepriv->wps_beacon_ie_len);
@ -1690,7 +1690,7 @@ static u8 search_max_mac_id(_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_priv *pstapriv = &padapter->stapriv;
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)){
for (aid = (pstapriv->max_num_sta); aid > 0; aid--)
@ -1698,13 +1698,6 @@ static u8 search_max_mac_id(_adapter *padapter)
if (pstapriv->sta_aid[aid-1] != NULL)
break;
}
/*
for (mac_id = (pstapriv->max_num_sta-1); mac_id >= 0; mac_id--)
{
if (pstapriv->sta_aid[mac_id] != NULL)
break;
}
*/
mac_id = aid + 1;
}
else
@ -1754,7 +1747,7 @@ _func_enter_;
if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
return;
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
{
psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr);