From 2cadb60abd8f1c11d181b170ee3a451c14799706 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 19 Jan 2021 20:07:36 +0100 Subject: [PATCH] robust_av: Use wpa_bss_ext_capab() helper Use the helper instead of open-coding the check. Since the helper doesn't handle a NULL BSS, keep that extra check. Signed-off-by: Johannes Berg --- wpa_supplicant/robust_av.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/robust_av.c b/wpa_supplicant/robust_av.c index 1280f5d96..7ecd35769 100644 --- a/wpa_supplicant/robust_av.c +++ b/wpa_supplicant/robust_av.c @@ -48,18 +48,14 @@ void wpas_populate_mscs_descriptor_ie(struct robust_av_data *robust_av, int wpas_send_mscs_req(struct wpa_supplicant *wpa_s) { struct wpabuf *buf; - const u8 *ext_capab = NULL; size_t buf_len; int ret; if (wpa_s->wpa_state != WPA_COMPLETED || !wpa_s->current_ssid) return 0; - if (wpa_s->current_bss) - ext_capab = wpa_bss_get_ie(wpa_s->current_bss, - WLAN_EID_EXT_CAPAB); - - if (!ext_capab || ext_capab[1] < 11 || !(ext_capab[12] & 0x20)) { + if (!wpa_s->current_bss || + !wpa_bss_ext_capab(wpa_s->current_bss, WLAN_EXT_CAPAB_MSCS)) { wpa_dbg(wpa_s, MSG_INFO, "AP does not support MSCS - could not send MSCS Req"); return -1;