From: Jouni Malinen Date: Sun, 8 Mar 2020 14:28:03 +0000 (+0200) Subject: Clean up hostapd_get_he_twt_responder() processing X-Git-Tag: hostap_2_10~1650 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15d63c6043f6e30b73054510ce22343783b895fb;p=thirdparty%2Fhostap.git Clean up hostapd_get_he_twt_responder() processing mode->he_capab is an array and as such, there is no point in checking whether it is NULL since that cannot be the case. Check for the he_supported flag instead. In addition, convert the TWT responder capability bit into a fixed value 1 to avoid any surprising to the callers. In practice, neither of these changes results in different behavior in the current implementation, but this is more robust. Signed-off-by: Jouni Malinen --- diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c index 4b23e48c7..57c6b18f4 100644 --- a/src/ap/ieee802_11_he.c +++ b/src/ap/ieee802_11_he.c @@ -421,10 +421,10 @@ int hostapd_get_he_twt_responder(struct hostapd_data *hapd, u8 *mac_cap; if (!hapd->iface->current_mode || - !hapd->iface->current_mode->he_capab) + !hapd->iface->current_mode->he_capab[mode].he_supported) return 0; mac_cap = hapd->iface->current_mode->he_capab[mode].mac_cap; - return mac_cap[HE_MAC_CAPAB_0] & HE_MACCAP_TWT_RESPONDER; + return !!(mac_cap[HE_MAC_CAPAB_0] & HE_MACCAP_TWT_RESPONDER); }