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

hostapd: Fix endian bugs in STA HT capability handling

Browse source
This commit is contained in:
Felix Fietkau 2009-11-16 13:58:08 +02:00 committed by Jouni Malinen
parent c6313c7505
commit 9510f00ff8
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hostapd/ieee802_11.c
View file

@ -1586,24 +1586,16 @@ hostapd_get_ht_capab(struct hostapd_data *hapd,
struct ht_cap_ie *ht_cap_ie,
struct ht_cap_ie *neg_ht_cap_ie)
{
u16 cap;
os_memcpy(neg_ht_cap_ie, ht_cap_ie, sizeof(struct ht_cap_ie));
neg_ht_cap_ie->data.capabilities_info =
ht_cap_ie->data.capabilities_info & hapd->iconf->ht_capab;
neg_ht_cap_ie->data.capabilities_info &= ~HT_CAP_INFO_SMPS_DISABLED;
if ((ht_cap_ie->data.capabilities_info & HT_CAP_INFO_SMPS_DISABLED) ==
(hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED))
neg_ht_cap_ie->data.capabilities_info |=
hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED;
else
neg_ht_cap_ie->data.capabilities_info |=
HT_CAP_INFO_SMPS_DISABLED;
cap = le_to_host16(neg_ht_cap_ie->data.capabilities_info);
cap &= hapd->iconf->ht_capab;
cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED);
/* FIXME: Rx STBC needs to be handled specially */
neg_ht_cap_ie->data.capabilities_info &= ~HT_CAP_INFO_RX_STBC_MASK;
neg_ht_cap_ie->data.capabilities_info |=
hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK;
cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK);
neg_ht_cap_ie->data.capabilities_info = host_to_le16(cap);
}
#endif /* CONFIG_IEEE80211N */