DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix AP mode HT Capabilities IE to use A-MPDU Parameters from the driver

Browse source 
Instead of using hardcoded maximum A-MPDU length of 64 kB and no
restrictions on minimum MPDU Start Spacing, use the correct values
reported by the driver.
This commit is contained in:
Jouni Malinen 2009-11-29 12:21:26 +02:00
parent a49148fd55
commit be8eb8ab3e
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hostapd/ieee802_11.c
View file

@ -116,12 +116,7 @@ u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid)
cap = (struct ieee80211_ht_capabilities *) pos; cap = (struct ieee80211_ht_capabilities *) pos;
os_memset(cap, 0, sizeof(*cap)); os_memset(cap, 0, sizeof(*cap));
cap->ht_capabilities_info = host_to_le16(hapd->iconf->ht_capab); cap->ht_capabilities_info = host_to_le16(hapd->iconf->ht_capab);
cap->a_mpdu_params = hapd->iface->current_mode->a_mpdu_params;
/* FIX: from driver */
SET_2BIT_U8(&cap->a_mpdu_params,
MAC_HT_PARAM_INFO_MAX_RX_AMPDU_FACTOR_OFFSET,
MAX_RX_AMPDU_FACTOR_64KB);
os_memcpy(cap->supported_mcs_set, hapd->iface->current_mode->mcs_set, os_memcpy(cap->supported_mcs_set, hapd->iface->current_mode->mcs_set,
16); 16);

1
src/drivers/driver.h
View file

@ -52,6 +52,7 @@ struct hostapd_hw_modes {
struct hostapd_rate_data *rates; struct hostapd_rate_data *rates;
u16 ht_capab; u16 ht_capab;
u8 mcs_set[16]; u8 mcs_set[16];
u8 a_mpdu_params;
}; };

12
src/drivers/driver_nl80211.c
View file

@ -2186,6 +2186,18 @@ static int phy_info_handler(struct nl_msg *msg, void *arg)
tb_band[NL80211_BAND_ATTR_HT_CAPA]); tb_band[NL80211_BAND_ATTR_HT_CAPA]);
} }
if (tb_band[NL80211_BAND_ATTR_HT_AMPDU_FACTOR]) {
mode->a_mpdu_params |= nla_get_u8(
tb_band[NL80211_BAND_ATTR_HT_AMPDU_FACTOR]) &
0x03;
}
if (tb_band[NL80211_BAND_ATTR_HT_AMPDU_DENSITY]) {
mode->a_mpdu_params |= nla_get_u8(
tb_band[NL80211_BAND_ATTR_HT_AMPDU_DENSITY]) <<
2;
}
if (tb_band[NL80211_BAND_ATTR_HT_MCS_SET] && if (tb_band[NL80211_BAND_ATTR_HT_MCS_SET] &&
nla_len(tb_band[NL80211_BAND_ATTR_HT_MCS_SET])) { nla_len(tb_band[NL80211_BAND_ATTR_HT_MCS_SET])) {
u8 *mcs; u8 *mcs;