skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-09 14:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Rework CONFIG_NATIVEAP_MLME

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

56
core/rtw_mlme_ext.c
View file

@ -53,29 +53,6 @@ static struct mlme_handler mlme_sta_tbl[]={
{WIFI_ACTION, "OnAction", &OnAction},
};
#ifdef _CONFIG_NATIVEAP_MLME_
struct mlme_handler mlme_ap_tbl[]={
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
{WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp},
{WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq},
{WIFI_REASSOCRSP, "OnReAssocRsp", &OnAssocRsp},
{WIFI_PROBEREQ, "OnProbeReq", &OnProbeReq},
{WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp},
/*----------------------------------------------------------
below 2 are reserved
-----------------------------------------------------------*/
{0, "DoReserved", &DoReserved},
{0, "DoReserved", &DoReserved},
{WIFI_BEACON, "OnBeacon", &OnBeacon},
{WIFI_ATIM, "OnATIM", &OnAtim},
{WIFI_DISASSOC, "OnDisassoc", &OnDisassoc},
{WIFI_AUTH, "OnAuth", &OnAuth},
{WIFI_DEAUTH, "OnDeAuth", &OnDeAuth},
{WIFI_ACTION, "OnAction", &OnAction},
};
#endif
static struct action_handler OnAction_tbl[]={
{RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct},
{RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos},
@ -1165,7 +1142,7 @@ unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
/* Now, we are going to issue_auth... */
pstat->auth_seq = seq + 1;
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
issue_auth(padapter, pstat, (unsigned short)(_STATS_SUCCESSFUL_));
#endif
@ -1184,7 +1161,7 @@ auth_fail:
pstat->auth_seq = 2;
_rtw_memcpy(pstat->hwaddr, sa, 6);
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
issue_auth(padapter, pstat, (unsigned short)status);
#endif
@ -1803,7 +1780,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
/* now the station is qualified to join our BSS... */
if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (_STATS_SUCCESSFUL_==status))
{
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
/* 1 bss_cap_update & sta_info_update */
bss_cap_update_on_sta_join(padapter, pstat);
sta_info_update(padapter, pstat);
@ -1855,7 +1832,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
asoc_class2_error:
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
issue_deauth(padapter, (void *)GetAddr2Ptr(pframe), status);
#endif
@ -1864,7 +1841,7 @@ asoc_class2_error:
OnAssocReqFail:
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
pstat->aid = 0;
if (frame_type == WIFI_ASSOCREQ)
issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP);
@ -5503,10 +5480,10 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
unsigned short *fctrl;
unsigned int rate_len;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
_irqL irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#endif /* if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
#endif /* if defined (CONFIG_AP_MODE) */
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
@ -5523,9 +5500,9 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
DBG_88E("%s, alloc mgnt frame fail\n", __func__);
return;
}
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
_enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
#endif /* if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
#endif /* if defined (CONFIG_AP_MODE) */
/* update attribute */
pattrib = &pmgntframe->attrib;
@ -5787,11 +5764,11 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
_issue_bcn:
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
pmlmepriv->update_bcn = false;
_exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
#endif /* if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
#endif /* if defined (CONFIG_AP_MODE) */
if ((pattrib->pktlen + TXDESC_SIZE) > 512)
{
@ -5818,11 +5795,11 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
unsigned short *fctrl;
unsigned char *mac, *bssid;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
u8 *pwps_ie;
uint wps_ielen;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#endif /* if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
#endif /* if defined (CONFIG_AP_MODE) */
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
@ -5873,7 +5850,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
if (cur_network->IELength>MAX_IE_SZ)
return;
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
#if defined (CONFIG_AP_MODE)
if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
{
pwps_ie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
@ -6221,7 +6198,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
if (psta)/* for AP mode */
{
#ifdef CONFIG_NATIVEAP_MLME
#ifdef CONFIG_AP_MODE
_rtw_memcpy(pwlanhdr->addr1, psta->hwaddr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
@ -9549,9 +9526,6 @@ u8 setopmode_hdl(_adapter *padapter, u8 *pbuf)
{
pmlmeinfo->state = WIFI_FW_AP_STATE;
type = _HW_STATE_AP_;
#ifdef CONFIG_NATIVEAP_MLME
/* start_ap_mode(padapter); */
#endif
}
else if (psetop->mode == Ndis802_11Infrastructure)
{