diff mbox series

[4/5] HE: properly populate beacon template prior to sending it to the kernel

Message ID 20190416123401.12379-4-john@phrozen.org
State Accepted
Headers show
Series [1/5] nl80211: add HW capabilities parsing support | expand

Commit Message

John Crispin April 16, 2019, 12:34 p.m. UTC 
Properly populate the the HE EID with the info read from the kernel.

Signed-off-by: Shashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: John Crispin <john@phrozen.org>
---
 src/ap/ieee802_11_he.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c
index 09ba6f231..ba300e390 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 || !mode->he_capab.he_supported)
 		return eid;
 
 	*pos++ = WLAN_EID_EXTENSION;
@@ -31,6 +32,10 @@  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;