Merge pull request #209 from kimocoder/v5.3.4

fixed VHT issue not selected because of wrong MESH condition
This commit is contained in:
Christian B 2018-10-04 21:33:41 +02:00 committed by GitHub
commit d2775e4248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2207,9 +2207,9 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
&& (!rfctl->country_ent || COUNTRY_CHPLAN_EN_11AC(rfctl->country_ent)) && (!rfctl->country_ent || COUNTRY_CHPLAN_EN_11AC(rfctl->country_ent))
) { ) {
if (vht_cap == _TRUE if (vht_cap == _TRUE
&& MLME_IS_MESH(padapter) /* allow only mesh temporarily before VHT IE checking is ready */
) { ) {
rtw_check_for_vht20(padapter, ie + _BEACON_IE_OFFSET_, pbss_network->IELength - _BEACON_IE_OFFSET_); if(MLME_IS_MESH(padapter)) /* allow only mesh temporarily before VHT IE checking is ready */
rtw_check_for_vht20(padapter, ie + _BEACON_IE_OFFSET_, pbss_network->IELength - _BEACON_IE_OFFSET_);
pmlmepriv->ori_vht_en = 1; pmlmepriv->ori_vht_en = 1;
pmlmepriv->vhtpriv.vht_option = _TRUE; pmlmepriv->vhtpriv.vht_option = _TRUE;
} else if (REGSTY_IS_11AC_AUTO(pregistrypriv)) { } else if (REGSTY_IS_11AC_AUTO(pregistrypriv)) {