mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +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
|
|
@ -548,12 +548,10 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if(psta)
|
||||
psta_ht = &psta->htpriv;
|
||||
else
|
||||
return;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
if(!(psta->state & _FW_LINKED))
|
||||
return;
|
||||
|
|
@ -564,7 +562,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
|||
if (psta->bssrateset[i])
|
||||
tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i]&0x7f);
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* n mode ra_bitmap */
|
||||
if(psta_ht->ht_option)
|
||||
{
|
||||
|
|
@ -582,7 +579,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
|||
/* max short GI rate */
|
||||
shortGIrate = psta_ht->sgi;
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
if ( pcur_network->Configuration.DSConfig > 14 ) {
|
||||
/* 5G band */
|
||||
|
|
@ -664,9 +660,7 @@ void update_bmc_sta(struct adapter *padapter)
|
|||
psta->mac_id = psta->aid + 1;
|
||||
|
||||
psta->qos_option = 0;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
psta->htpriv.ht_option = false;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
psta->ieee8021x_blocked = 0;
|
||||
|
||||
|
|
@ -759,10 +753,8 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
|
||||
struct ht_priv *phtpriv_sta = &psta->htpriv;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
/* set intf_tag to if1 */
|
||||
/* psta->intf_tag = 0; */
|
||||
|
||||
|
|
@ -783,7 +775,6 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
|
|||
|
||||
/* ERP */
|
||||
VCS_update(padapter, psta);
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* HT related cap */
|
||||
if(phtpriv_sta->ht_option)
|
||||
{
|
||||
|
|
@ -824,7 +815,6 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
|
|||
send_delba(padapter, 1, psta->hwaddr);/* originator */
|
||||
phtpriv_sta->agg_enable_bitmap = 0x0;/* reset */
|
||||
phtpriv_sta->candidate_tid_bitmap = 0x0;/* reset */
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
/* todo: init other variables */
|
||||
|
||||
|
|
@ -913,7 +903,6 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
|
|||
/* pmlmeinfo->HT_enable; */
|
||||
if(pmlmepriv->qospriv.qos_option)
|
||||
pmlmeinfo->WMM_enable = true;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if(pmlmepriv->htpriv.ht_option)
|
||||
{
|
||||
pmlmeinfo->WMM_enable = true;
|
||||
|
|
@ -923,8 +912,6 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
|
|||
|
||||
update_hw_ht_param(padapter);
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
|
||||
if(pmlmepriv->cur_network.join_res != true) /* setting only at first time */
|
||||
{
|
||||
|
|
@ -965,7 +952,6 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
|
|||
/* turn on all dynamic functions */
|
||||
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* set channel, bwmode */
|
||||
p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs)));
|
||||
if( p && ie_len)
|
||||
|
|
@ -998,7 +984,6 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
|
|||
}
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
/* TODO: need to judge the phy parameters on concurrent mode for single phy */
|
||||
/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
|
||||
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
|
||||
|
|
@ -1245,7 +1230,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
|||
}
|
||||
}
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* parsing HT_CAP_IE */
|
||||
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
|
||||
if(p && ie_len>0)
|
||||
|
|
@ -1291,7 +1275,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
|||
{
|
||||
pHT_info_ie=p;
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
switch(network_type)
|
||||
{
|
||||
case WIRELESS_11B:
|
||||
|
|
@ -1313,7 +1296,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
|||
|
||||
pmlmepriv->cur_network.network_type = network_type;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pmlmepriv->htpriv.ht_option = false;
|
||||
|
||||
if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
|
||||
|
|
@ -1338,9 +1320,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
|||
|
||||
HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
pbss_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pbss_network);
|
||||
|
||||
/* issue beacon to start bss network */
|
||||
|
|
@ -1733,8 +1712,6 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
|
|||
set_tx_beacon_cmd(padapter);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
/*
|
||||
op_mode
|
||||
Set to 0 (HT pure) under the followign conditions
|
||||
|
|
@ -1818,8 +1795,6 @@ static int rtw_ht_operation_update(struct adapter *padapter)
|
|||
|
||||
}
|
||||
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
void associated_clients_update(struct adapter *padapter, u8 updated)
|
||||
{
|
||||
/* update associcated stations cap. */
|
||||
|
|
@ -1944,8 +1919,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
if (psta->flags & WLAN_STA_HT)
|
||||
{
|
||||
u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info);
|
||||
|
|
@ -2001,8 +1974,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
|
|||
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
/* update associcated stations cap. */
|
||||
associated_clients_update(padapter, beacon_updated);
|
||||
|
||||
|
|
@ -2051,8 +2022,6 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
if (psta->no_ht_gf_set) {
|
||||
psta->no_ht_gf_set = 0;
|
||||
pmlmepriv->num_sta_ht_no_gf--;
|
||||
|
|
@ -2074,8 +2043,6 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
|
|||
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
DBG_871X("%s, updated=%d\n", __func__, beacon_updated);
|
||||
|
||||
return beacon_updated;
|
||||
|
|
@ -2095,18 +2062,14 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16
|
|||
|
||||
if (active == true)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* tear down Rx AMPDU */
|
||||
send_delba(padapter, 0, psta->hwaddr);/* recipient */
|
||||
|
||||
/* tear down TX AMPDU */
|
||||
send_delba(padapter, 1, psta->hwaddr);/* originator */
|
||||
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
issue_deauth(padapter, psta->hwaddr, reason);
|
||||
}
|
||||
|
||||
psta->htpriv.agg_enable_bitmap = 0x0;/* reset */
|
||||
psta->htpriv.candidate_tid_bitmap = 0x0;/* reset */
|
||||
|
||||
|
|
@ -2256,8 +2219,6 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)
|
|||
if(pmlmepriv->qospriv.qos_option == 0)
|
||||
psta->qos_option = 0;
|
||||
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* update 802.11n ht cap. */
|
||||
if(WLAN_STA_HT&flags)
|
||||
{
|
||||
|
|
@ -2271,12 +2232,8 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)
|
|||
|
||||
if(pmlmepriv->htpriv.ht_option == false)
|
||||
psta->htpriv.ht_option = false;
|
||||
#endif
|
||||
|
||||
|
||||
update_sta_info_apmode(padapter, psta);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* called >= TSR LEVEL for USB or SDIO Interface*/
|
||||
|
|
@ -2376,18 +2333,14 @@ void start_ap_mode(struct adapter *padapter)
|
|||
pmlmepriv->num_sta_no_short_preamble = 0;
|
||||
|
||||
pmlmepriv->num_sta_ht_no_gf = 0;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pmlmepriv->num_sta_no_ht = 0;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
pmlmepriv->num_sta_ht_20mhz = 0;
|
||||
|
||||
pmlmepriv->olbc = false;
|
||||
|
||||
pmlmepriv->olbc_ht = false;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pmlmepriv->ht_op_mode = 0;
|
||||
#endif
|
||||
|
||||
for(i=0; i<NUM_STA; i++)
|
||||
pstapriv->sta_aid[i] = NULL;
|
||||
|
|
|
|||
|
|
@ -1144,9 +1144,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
|
|||
struct qos_priv *pqospriv= &pmlmepriv->qospriv;
|
||||
struct security_priv *psecuritypriv=&padapter->securitypriv;
|
||||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
|
@ -1251,7 +1249,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
phtpriv->ht_option = false;
|
||||
if(pregistrypriv->ht_enable)
|
||||
{
|
||||
|
|
@ -1267,9 +1264,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
|
|||
pnetwork->network.IELength, &psecnetwork->IELength);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength);
|
||||
|
||||
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_TENDA)
|
||||
|
|
|
|||
|
|
@ -289,9 +289,7 @@ int proc_get_ht_option(char *page, char **start,
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
||||
int len = 0;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
len += snprintf(page + len, count - len, "ht_option=%d\n", pmlmepriv->htpriv.ht_option);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
*eof = 1;
|
||||
return len;
|
||||
}
|
||||
|
|
@ -338,12 +336,10 @@ int proc_get_ap_info(char *page, char **start,
|
|||
len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
|
||||
len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
|
||||
len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
|
||||
#ifdef CONFIG_80211N_HT
|
||||
len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
|
||||
len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
|
||||
len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
|
||||
len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
for(i=0;i<16;i++)
|
||||
{
|
||||
|
|
@ -711,7 +707,6 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
|
|||
return count;
|
||||
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
int proc_get_ht_enable(char *page, char **start,
|
||||
off_t offset, int count,
|
||||
|
|
@ -856,7 +851,6 @@ int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
|
|||
return count;
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
int proc_get_two_path_rssi(char *page, char **start,
|
||||
off_t offset, int count,
|
||||
|
|
@ -877,7 +871,7 @@ int proc_get_two_path_rssi(char *page, char **start,
|
|||
*eof = 1;
|
||||
return len;
|
||||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
int proc_get_rx_stbc(char *page, char **start,
|
||||
off_t offset, int count,
|
||||
int *eof, void *data)
|
||||
|
|
@ -924,8 +918,6 @@ int proc_set_rx_stbc(struct file *file, const char __user *buffer,
|
|||
return count;
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
|
||||
int proc_get_rssi_disp(char *page, char **start,
|
||||
off_t offset, int count,
|
||||
|
|
@ -1013,12 +1005,10 @@ int proc_get_all_sta_info(char *page, char **start,
|
|||
len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
|
||||
len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
|
||||
len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
|
||||
#ifdef CONFIG_80211N_HT
|
||||
len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
|
||||
len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
|
||||
len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
|
||||
len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
len += snprintf(page + len, count - len, "sleepq_len=%d\n", psta->sleepq_len);
|
||||
len += snprintf(page + len, count - len, "capability=0x%x\n", psta->capability);
|
||||
len += snprintf(page + len, count - len, "flags=0x%x\n", psta->flags);
|
||||
|
|
|
|||
|
|
@ -478,14 +478,12 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
|
|||
ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* HT Cap. */
|
||||
if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N))
|
||||
&& (pregistrypriv->ht_enable==true))
|
||||
{
|
||||
/* todo: */
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
/* return _SUCCESS; */
|
||||
return sz;
|
||||
|
|
|
|||
|
|
@ -1223,19 +1223,16 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
|
|||
struct registry_priv *pregistrypriv = &adapter->registrypriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct rtw_ieee80211_ht_cap *pht_capie;
|
||||
u8 rf_type = 0;
|
||||
u8 bw_40MHz=0, short_GI_20=0, short_GI_40=0;
|
||||
u16 mcs_rate=0;
|
||||
u32 ht_ielen = 0;
|
||||
#endif
|
||||
|
||||
if((check_fwstate(pmlmepriv, _FW_LINKED) != true)
|
||||
&& (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
|
||||
return 0;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N|WIRELESS_11_5N)) {
|
||||
p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12);
|
||||
if(p && ht_ielen>0)
|
||||
|
|
@ -1263,7 +1260,6 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
{
|
||||
while( (pcur_bss->SupportedRates[i]!=0) && (pcur_bss->SupportedRates[i]!=0xFF))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1693,15 +1693,9 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
|
|||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Invalid network_mode\n"));
|
||||
break;
|
||||
}
|
||||
|
||||
rtw_update_protection(padapter, (cur_network->network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
|
||||
(cur_network->network.IELength));
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength);
|
||||
#endif
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* Notes: the fucntion could be > passive_level (the same context as Rx tasklet) */
|
||||
|
|
@ -3005,18 +2999,10 @@ void rtw_joinbss_reset(struct adapter *padapter)
|
|||
{
|
||||
u8 threshold;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
#endif
|
||||
|
||||
/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
pmlmepriv->num_FortyMHzIntolerant = 0;
|
||||
|
||||
pmlmepriv->num_sta_no_ht = 0;
|
||||
|
|
@ -3038,12 +3024,8 @@ void rtw_joinbss_reset(struct adapter *padapter)
|
|||
threshold = 1;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
/* the fucntion is >= passive_level */
|
||||
unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len)
|
||||
{
|
||||
|
|
@ -3303,8 +3285,6 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
|
|||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LAYER2_ROAMING
|
||||
inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3239,9 +3239,6 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram
|
|||
#ifdef CONFIG_TDLS
|
||||
struct sta_info *psta = prframe->u.hdr.psta;
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
#ifdef CONFIG_TDLS
|
||||
|
|
@ -3270,7 +3267,6 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram
|
|||
}
|
||||
}
|
||||
else /* B/G mode */
|
||||
#endif
|
||||
{
|
||||
retval=wlanhdr_to_ethhdr (prframe);
|
||||
if(retval != _SUCCESS)
|
||||
|
|
@ -3398,7 +3394,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
|
|||
rtw_wapi_update_info(padapter, prframe);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
ret = process_recv_indicatepkts(padapter, prframe);
|
||||
if (ret != _SUCCESS)
|
||||
{
|
||||
|
|
@ -3409,68 +3404,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
|
|||
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
#else /* CONFIG_80211N_HT */
|
||||
if (!pattrib->amsdu)
|
||||
{
|
||||
ret = wlanhdr_to_ethhdr (prframe);
|
||||
if (ret != _SUCCESS)
|
||||
{
|
||||
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n"));
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__);
|
||||
#endif
|
||||
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
|
||||
if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false))
|
||||
{
|
||||
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: recv_func rtw_recv_indicatepkt\n" ));
|
||||
/* indicate this recv_frame */
|
||||
ret = rtw_recv_indicatepkt(padapter, prframe);
|
||||
if (ret != _SUCCESS)
|
||||
{
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__);
|
||||
#endif
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: rtw_free_recvframe\n" ));
|
||||
RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __FUNCTION__,
|
||||
padapter->bDriverStopped, padapter->bSurpriseRemoved);
|
||||
#endif
|
||||
ret = _FAIL;
|
||||
rtw_free_recvframe(orig_prframe, pfree_recv_queue); /* free this recv_frame */
|
||||
}
|
||||
|
||||
}
|
||||
else if(pattrib->amsdu==1)
|
||||
{
|
||||
|
||||
ret = amsdu_to_msdu(padapter, prframe);
|
||||
if(ret != _SUCCESS)
|
||||
{
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
|
||||
#endif
|
||||
rtw_free_recvframe(orig_prframe, pfree_recv_queue);
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __FUNCTION__);
|
||||
#endif
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
_exit_recv_func:
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -880,7 +880,6 @@ void WMMOnAssocRsp(struct adapter *padapter)
|
|||
|
||||
static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
unsigned char new_bwmode;
|
||||
unsigned char new_ch_offset;
|
||||
struct HT_info_element *pHT_info;
|
||||
|
|
@ -972,12 +971,10 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_
|
|||
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
unsigned int i;
|
||||
u8 rf_type;
|
||||
u8 max_AMPDU_len, min_MPDU_spacing;
|
||||
|
|
@ -1058,13 +1055,10 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
return;
|
||||
}
|
||||
|
||||
void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
|
@ -1080,8 +1074,6 @@ void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
|
||||
pmlmeinfo->HT_info_enable = 1;
|
||||
memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->Length);
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
return;
|
||||
}
|
||||
|
||||
void HTOnAssocRsp(struct adapter *padapter)
|
||||
|
|
|
|||
|
|
@ -546,22 +546,12 @@ static void update_attrib_phy_info(struct pkt_attrib *pattrib, struct sta_info *
|
|||
pattrib->qos_en = psta->qos_option;
|
||||
|
||||
pattrib->raid = psta->raid;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pattrib->ht_en = psta->htpriv.ht_option;
|
||||
pattrib->bwmode = psta->htpriv.bwmode;
|
||||
pattrib->ch_offset = psta->htpriv.ch_offset;
|
||||
pattrib->sgi= psta->htpriv.sgi;
|
||||
pattrib->ampdu_en = false;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
/* if(pattrib->ht_en && psta->htpriv.ampdu_enable) */
|
||||
/* */
|
||||
/* if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) */
|
||||
/* pattrib->ampdu_en = true; */
|
||||
/* */
|
||||
|
||||
|
||||
pattrib->retry_ctrl = false;
|
||||
|
||||
}
|
||||
|
||||
u8 qos_acm(u8 acm_mask, u8 priority)
|
||||
|
|
@ -1221,7 +1211,6 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
|
|||
|
||||
SetSeqNum(hdr, pattrib->seqnum);
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* check if enable ampdu */
|
||||
if(pattrib->ht_en && psta->htpriv.ampdu_enable)
|
||||
{
|
||||
|
|
@ -1256,7 +1245,6 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
|
|||
}
|
||||
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
#ifdef CONFIG_TDLS
|
||||
if(direct_link==1)
|
||||
{
|
||||
|
|
@ -1270,12 +1258,10 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
|
|||
/* pattrib->qos_en = ptdls_sta->qos_option; */
|
||||
|
||||
pattrib->raid = ptdls_sta->raid;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
pattrib->bwmode = ptdls_sta->htpriv.bwmode;
|
||||
pattrib->ht_en = ptdls_sta->htpriv.ht_option;
|
||||
pattrib->ch_offset = ptdls_sta->htpriv.ch_offset;
|
||||
pattrib->sgi= ptdls_sta->htpriv.sgi;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
pattrib->mac_id = ptdls_sta->mac_id;
|
||||
|
||||
psta = psta_backup;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue