From: John Crispin Date: Tue, 16 Apr 2019 12:34:00 +0000 (+0200) Subject: HE: Properly populate Beacon template prior to sending it to the kernel X-Git-Tag: hostap_2_9~343 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fde3caa3a26f3f8bd139d5578326cf8249c0e53;p=thirdparty%2Fhostap.git HE: Properly populate Beacon template prior to sending it to the kernel Properly populate the the HE Capabilities element with the info read from the kernel. Signed-off-by: Shashidhar Lakkavalli Signed-off-by: John Crispin --- diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c index 09ba6f231..10e5ac517 100644 --- a/src/ap/ieee802_11_he.c +++ b/src/ap/ieee802_11_he.c @@ -19,9 +19,10 @@ u8 * hostapd_eid_he_capab(struct hostapd_data *hapd, u8 *eid) { struct ieee80211_he_capabilities *cap; + struct hostapd_hw_modes *mode = hapd->iface->current_mode; u8 *pos = eid; - if (!hapd->iface->current_mode) + if (!mode) return eid; *pos++ = WLAN_EID_EXTENSION; @@ -31,6 +32,13 @@ u8 * hostapd_eid_he_capab(struct hostapd_data *hapd, u8 *eid) cap = (struct ieee80211_he_capabilities *) pos; os_memset(cap, 0, sizeof(*cap)); + os_memcpy(cap->he_mac_capab_info, mode->he_capab.mac_cap, + HE_MAX_MAC_CAPAB_SIZE); + os_memcpy(cap->he_phy_capab_info, mode->he_capab.phy_cap, + HE_MAX_PHY_CAPAB_SIZE); + os_memcpy(cap->he_txrx_mcs_support, mode->he_capab.mcs, + HE_MAX_MCS_CAPAB_SIZE); + if (hapd->iface->conf->he_phy_capab.he_su_beamformer) cap->he_phy_capab_info[HE_PHYCAP_SU_BEAMFORMER_CAPAB_IDX] |= HE_PHYCAP_SU_BEAMFORMER_CAPAB;