mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-07 14:03:05 +00:00
rtl8188eu: Remove tests on macro CONFIG_80211N_HT
This one is always selected. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
e9184bd34c
commit
e3e242b712
28 changed files with 46 additions and 428 deletions
|
@ -682,10 +682,8 @@ u8 query_ra_short_GI(struct sta_info *psta, u8 bw)
|
|||
{
|
||||
u8 sgi = _FALSE, sgi_20m = _FALSE, sgi_40m = _FALSE, sgi_80m = _FALSE;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
sgi_20m = psta->htpriv.sgi_20m;
|
||||
sgi_40m = psta->htpriv.sgi_40m;
|
||||
#endif
|
||||
|
||||
switch (bw) {
|
||||
case CHANNEL_WIDTH_80:
|
||||
|
@ -837,7 +835,6 @@ static void update_attrib_phy_info(_adapter *padapter, struct pkt_attrib *pattri
|
|||
pattrib->ldpc = psta->ldpc;
|
||||
pattrib->stbc = psta->stbc;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pattrib->ht_en = psta->htpriv.ht_option;
|
||||
pattrib->ch_offset = psta->htpriv.ch_offset;
|
||||
pattrib->ampdu_en = _FALSE;
|
||||
|
@ -857,7 +854,6 @@ static void update_attrib_phy_info(_adapter *padapter, struct pkt_attrib *pattri
|
|||
pattrib->amsdu_ampdu_en = _FALSE;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
/* if(pattrib->ht_en && psta->htpriv.ampdu_enable) */
|
||||
/* { */
|
||||
/* if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) */
|
||||
|
@ -869,12 +865,10 @@ static void update_attrib_phy_info(_adapter *padapter, struct pkt_attrib *pattri
|
|||
psta = pattrib->ptdls_sta;
|
||||
|
||||
pattrib->raid = psta->raid;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pattrib->bwmode = rtw_get_tx_bw_mode(padapter, psta);
|
||||
pattrib->ht_en = psta->htpriv.ht_option;
|
||||
pattrib->ch_offset = psta->htpriv.ch_offset;
|
||||
pattrib->sgi = query_ra_short_GI(psta, pattrib->bwmode);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
|
@ -1689,7 +1683,6 @@ s32 rtw_make_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
|
|||
|
||||
SetSeqNum(hdr, pattrib->seqnum);
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* re-check if enable ampdu by BA_starting_seqctrl */
|
||||
if (pattrib->ampdu_en == _TRUE) {
|
||||
u16 tx_seq;
|
||||
|
@ -1711,10 +1704,8 @@ s32 rtw_make_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
|
|||
}
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue