jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HT: Skip ht_capab validation if ieee80211n=0

Browse source 
There is no point in running through the 40 MHz scan if HT is
actually disabled regardless of whether the ht_capab parameter
is set.
This commit is contained in:
Sujith Manoharan 2011-03-16 11:22:40 +02:00 committed by Jouni Malinen
parent 4db9f805c7
commit ec2b890981
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ap/hw_features.c
View file

@ -486,9 +486,6 @@ static int ieee80211n_supported_ht_capab(struct hostapd_iface *iface)
u16 hw = iface->current_mode->ht_capab; u16 hw = iface->current_mode->ht_capab;
u16 conf = iface->conf->ht_capab; u16 conf = iface->conf->ht_capab;
if (!iface->conf->ieee80211n)
return 1;
if ((conf & HT_CAP_INFO_LDPC_CODING_CAP) && if ((conf & HT_CAP_INFO_LDPC_CODING_CAP) &&
!(hw & HT_CAP_INFO_LDPC_CODING_CAP)) { !(hw & HT_CAP_INFO_LDPC_CODING_CAP)) {
wpa_printf(MSG_ERROR, "Driver does not support configured " wpa_printf(MSG_ERROR, "Driver does not support configured "
@ -588,6 +585,8 @@ int hostapd_check_ht_capab(struct hostapd_iface *iface)
{ {
#ifdef CONFIG_IEEE80211N #ifdef CONFIG_IEEE80211N
int ret; int ret;
if (!iface->conf->ieee80211n)
return 0;
if (!ieee80211n_supported_ht_capab(iface)) if (!ieee80211n_supported_ht_capab(iface))
return -1; return -1;
ret = ieee80211n_check_40mhz(iface); ret = ieee80211n_check_40mhz(iface);