mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-09 06:43:06 +00:00
rtl8188eu: Remove CONFIG_80211N_HT
This one is always selected. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
37a28f802f
commit
2b27b83d40
21 changed files with 100 additions and 379 deletions
|
|
@ -1748,8 +1748,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* save HT capabilities in the sta object */
|
||||
memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap));
|
||||
if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct rtw_ieee80211_ht_cap))
|
||||
|
|
@ -1781,7 +1779,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
/* status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; */
|
||||
/* goto OnAssocReqFail; */
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
/* */
|
||||
pstat->flags |= WLAN_STA_NONERP;
|
||||
|
|
@ -2359,7 +2356,6 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
|
|||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
u8 *pframe = precv_frame->u.hdr.rx_data;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* check RA matches or not */
|
||||
if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN))/* for if1, sta/ap mode */
|
||||
return _SUCCESS;
|
||||
|
|
@ -2463,7 +2459,6 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
return _SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -6713,7 +6708,6 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
|
|||
pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8), pstat->bssrateset+8, &(pattrib->pktlen));
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if ((pstat->flags & WLAN_STA_HT) && (pmlmepriv->htpriv.ht_option)) {
|
||||
uint ie_len=0;
|
||||
|
||||
|
|
@ -6736,7 +6730,6 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
|
|||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
/* FILL WMM IE */
|
||||
if ((pstat->flags & WLAN_STA_WME) && (pmlmepriv->qospriv.qos_option)) {
|
||||
|
|
@ -6947,7 +6940,6 @@ void issue_assocreq(struct adapter *padapter)
|
|||
if (p != NULL)
|
||||
pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2), &(pattrib->pktlen));
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* HT caps */
|
||||
if(padapter->mlmepriv.htpriv.ht_option==true) {
|
||||
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs)));
|
||||
|
|
@ -7006,7 +6998,6 @@ void issue_assocreq(struct adapter *padapter)
|
|||
{
|
||||
/* set to 8K */
|
||||
pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &= (u8)~IEEE80211_HT_CAP_AMPDU_FACTOR;
|
||||
/* pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para |= MAX_AMPDU_FACTOR_8K */
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -7014,7 +7005,6 @@ void issue_assocreq(struct adapter *padapter)
|
|||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* vendor specific IE, such as WPA, WMM, WPS */
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;)
|
||||
|
|
@ -7798,7 +7788,6 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
|||
u8 tendaAPMac[] = {0xC8, 0x3A, 0x35};
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
DBG_871X("%s, category=%d, action=%d, status=%d\n", __FUNCTION__, category, action, status);
|
||||
|
||||
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
|
||||
|
|
@ -7932,7 +7921,6 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
|||
pattrib->last_txcmdsz = pattrib->pktlen;
|
||||
|
||||
dump_mgntframe(padapter, pmgntframe);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
||||
|
|
@ -7953,7 +7941,6 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
|||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
u8 InfoContent[16] = {0};
|
||||
u8 ICS[8][15];
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if((pmlmepriv->num_FortyMHzIntolerant==0) || (pmlmepriv->num_sta_no_ht==0))
|
||||
return;
|
||||
|
||||
|
|
@ -8044,16 +8031,13 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
|||
continue;
|
||||
|
||||
ICS[0][pbss_network->Configuration.DSConfig]=1;
|
||||
|
||||
if(ICS[0][0] == 0)
|
||||
ICS[0][0] = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
|
||||
|
||||
for(i= 0;i<8;i++)
|
||||
{
|
||||
if(ICS[i][0] == 1)
|
||||
|
|
@ -8076,21 +8060,13 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
pframe = rtw_set_ie(pframe, EID_BSSIntolerantChlReport, k, InfoContent, &(pattrib->pktlen));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
pattrib->last_txcmdsz = pattrib->pktlen;
|
||||
|
||||
dump_mgntframe(padapter, pmgntframe);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
||||
|
|
@ -8132,7 +8108,6 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
|||
}
|
||||
else if(initiator == 1)/* originator */
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* DBG_871X("tx agg_enable_bitmap(0x%08x)\n", psta->htpriv.agg_enable_bitmap); */
|
||||
for(tid = 0;tid<MAXTID;tid++)
|
||||
{
|
||||
|
|
@ -8146,11 +8121,8 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
|||
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
return _SUCCESS;
|
||||
|
||||
}
|
||||
|
||||
unsigned int send_beacon(struct adapter *padapter)
|
||||
|
|
@ -8664,7 +8636,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA
|
|||
if((pregistrypriv->wifi_spec==1) && (false == pmlmeinfo->bwmode_updated))
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
p = rtw_get_ie(bssid->IEs + ie_offset, _HT_CAPABILITY_IE_, &len, bssid->IELength - ie_offset);
|
||||
if (p && len > 0) {
|
||||
struct HT_caps_element *pHT_caps;
|
||||
|
|
@ -8675,8 +8646,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA
|
|||
} else {
|
||||
pmlmepriv->num_sta_no_ht++;
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
}
|
||||
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
|
|
@ -9508,7 +9477,6 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)
|
|||
/* ERP */
|
||||
VCS_update(padapter, psta);
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* HT */
|
||||
if(pmlmepriv->htpriv.ht_option)
|
||||
{
|
||||
|
|
@ -9523,25 +9491,20 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)
|
|||
|
||||
}
|
||||
else
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
psta->htpriv.ht_option = false;
|
||||
|
||||
psta->htpriv.ampdu_enable = false;
|
||||
|
||||
psta->htpriv.sgi = false;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
psta->qos_option = false;
|
||||
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
psta->htpriv.bwmode = pmlmeext->cur_bwmode;
|
||||
psta->htpriv.ch_offset = pmlmeext->cur_ch_offset;
|
||||
|
||||
psta->htpriv.agg_enable_bitmap = 0x0;/* reset */
|
||||
psta->htpriv.candidate_tid_bitmap = 0x0;/* reset */
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
/* QoS */
|
||||
if(pmlmepriv->qospriv.qos_option)
|
||||
|
|
@ -10079,7 +10042,6 @@ void link_timer_hdl(struct adapter *padapter)
|
|||
|
||||
void addba_timer_hdl(struct sta_info *psta)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv;
|
||||
|
||||
if(!psta)
|
||||
|
|
@ -10093,7 +10055,6 @@ void addba_timer_hdl(struct sta_info *psta)
|
|||
phtpriv->candidate_tid_bitmap=0x0;
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
|
|
@ -10315,7 +10276,6 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
|
|||
break;
|
||||
|
||||
case _HT_EXTRA_INFO_IE_: /* Get HT Info IE. */
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pmlmeinfo->HT_info_enable = 1;
|
||||
|
||||
/* spec case only for cisco's ap because cisco's ap issue assoc rsp using mcs rate @40MHz or @20MHz */
|
||||
|
|
@ -10345,9 +10305,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
|
|||
DBG_871X("set ch/bw before connected\n");
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -10745,7 +10703,6 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
|
|||
if(!psta)
|
||||
return H2C_SUCCESS;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||
|
||||
((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE))
|
||||
{
|
||||
|
|
@ -10772,7 +10729,6 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
|
|||
{
|
||||
psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid);
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
return H2C_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue