From 3756acfd48c0a2547ab2a80ce77f1ca7d70837e4 Mon Sep 17 00:00:00 2001 From: Avraham Stern Date: Sun, 11 Jun 2017 15:41:20 +0300 Subject: [PATCH] RRM: Send Radio Measurement response when beacon report scan fails When failing to trigger scan for beacon report (e.g., when the requested duration is not supported by the driver), send a Radio Measurement response with the mode set to refused and don't retry the scan. Signed-off-by: Avraham Stern --- wpa_supplicant/rrm.c | 2 +- wpa_supplicant/scan.c | 7 ++++++- wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c index 12c256ceb..f1b70c323 100644 --- a/wpa_supplicant/rrm.c +++ b/wpa_supplicant/rrm.c @@ -870,7 +870,7 @@ static void wpas_beacon_rep_table(struct wpa_supplicant *wpa_s, } -static void wpas_rrm_refuse_request(struct wpa_supplicant *wpa_s) +void wpas_rrm_refuse_request(struct wpa_supplicant *wpa_s) { if (!is_multicast_ether_addr(wpa_s->rrm.dst_addr)) { struct wpabuf *buf = NULL; diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 964adba54..104b25898 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -200,7 +200,8 @@ static void wpas_trigger_scan_cb(struct wpa_radio_work *work, int deinit) wpa_scan_free_params(params); work->ctx = NULL; if (ret) { - int retry = wpa_s->last_scan_req != MANUAL_SCAN_REQ; + int retry = wpa_s->last_scan_req != MANUAL_SCAN_REQ && + !wpa_s->beacon_rep_data.token; if (wpa_s->disconnected) retry = 0; @@ -222,6 +223,10 @@ static void wpas_trigger_scan_cb(struct wpa_radio_work *work, int deinit) /* Clear the scan_res_handler */ wpa_s->scan_res_handler = NULL; } + + if (wpa_s->beacon_rep_data.token) + wpas_rrm_refuse_request(wpa_s); + return; } diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index db39d1056..8b7d2f5c8 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -1317,6 +1317,7 @@ void wpas_rrm_handle_link_measurement_request(struct wpa_supplicant *wpa_s, const u8 *src, const u8 *frame, size_t len, int rssi); +void wpas_rrm_refuse_request(struct wpa_supplicant *wpa_s); int wpas_beacon_rep_scan_process(struct wpa_supplicant *wpa_s, struct wpa_scan_results *scan_res, struct scan_info *info);