hostap: Update 11k roaming mechanism

With this changes, device will check if AP support Neighbor Report or
not before trigger roaming. No need to issue 11k command to enable 11k,
if AP supports Neighbor Report, device will trigger 11k roaming with
priority.

Signed-off-by: Hui Bai <[email protected]>

Author: nxf58150

include/zephyr/net/wifi_mgmt.h

@@ -1594,6 +1594,14 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*btm_query)(const struct device *dev, uint8_t reason);
+
+	/** Check if ap support Neighbor Report or not.
+	 * @param dev Pointer to the device structure for the driver instance.
+	 *
+	 * @return true if support, false if not support
+	 */
+	bool (*bss_support_neighbor_rep)(const struct device *dev);
+
 	/** Judge ap whether support the capability
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.

modules/hostap/src/supp_api.c

@@ -1793,6 +1793,35 @@ int supplicant_get_rts_threshold(const struct device *dev, unsigned int *rts_thr
 	return wifi_mgmt_api->get_rts_threshold(dev, rts_threshold);
 }
 
+bool supplicant_bss_support_neighbor_rep(const struct device *dev)
+{
+	struct wpa_supplicant *wpa_s;
+	bool is_support = false;
+	const u8 *rrm_ie = NULL;
+
+	wpa_s = get_wpa_s_handle(dev);
+	if (!wpa_s) {
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		return false;
+	}
+
+	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+	if (!wpa_s->rrm.rrm_used) {
+		goto out;
+	}
+
+	rrm_ie = wpa_bss_get_ie(wpa_s->current_bss,
+				WLAN_EID_RRM_ENABLED_CAPABILITIES);
+	if (!rrm_ie || !(wpa_s->current_bss->caps & IEEE80211_CAP_RRM) ||
+	    !(rrm_ie[2] & WLAN_RRM_CAPS_NEIGHBOR_REPORT)) {
+		goto out;
+	}
+	is_support = true;
+out:
+	k_mutex_unlock(&wpa_supplicant_mutex);
+	return is_support;
+}
+
 int supplicant_bss_ext_capab(const struct device *dev, int capab)
 {
 	struct wpa_supplicant *wpa_s;

modules/hostap/src/supp_api.h

@@ -277,6 +277,14 @@ int supplicant_btm_query(const struct device *dev, uint8_t reason);
  */
 int supplicant_legacy_roam(const struct device *dev);
 
+/** Check if ap supports Neighbor report or not.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ *
+ * @return true if support, false if not support
+ */
+bool supplicant_bss_support_neighbor_rep(const struct device *dev);
+
 /** Judge ap whether support the capability
  *
  * @param dev Pointer to the device structure for the driver instance.

modules/hostap/src/supp_main.c

@@ -76,6 +76,7 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.channel = supplicant_channel,
 	.set_rts_threshold = supplicant_set_rts_threshold,
 	.get_rts_threshold = supplicant_get_rts_threshold,
+	.bss_support_neighbor_rep = supplicant_bss_support_neighbor_rep,
 	.bss_ext_capab = supplicant_bss_ext_capab,
 	.legacy_roam = supplicant_legacy_roam,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM

subsys/net/l2/wifi/wifi_mgmt.c

@@ -41,7 +41,6 @@ struct wifi_rrm_neighbor_report_t {
 
 struct wifi_roaming_params {
 	bool is_11r_used;
-	bool is_11k_enabled;
 	struct wifi_rrm_neighbor_report_t neighbor_rep;
 };
 
@@ -565,7 +564,7 @@ static int wifi_start_roaming(uint64_t mgmt_request, struct net_if *iface,
 		}
 
 		return wifi_mgmt_api->start_11r_roaming(dev);
-	} else if (roaming_params.is_11k_enabled) {
+	} else if (wifi_mgmt_api->bss_support_neighbor_rep(dev)) {
 		memset(&roaming_params.neighbor_rep, 0x0, sizeof(roaming_params.neighbor_rep));
 		if (wifi_mgmt_api->send_11k_neighbor_request == NULL) {
 			return -ENOTSUP;
@@ -890,12 +889,6 @@ static int wifi_11k_cfg(uint64_t mgmt_request, struct net_if *iface,
 		return -ENETDOWN;
 	}
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_ROAMING
-	if (params->oper == WIFI_MGMT_SET) {
-		roaming_params.is_11k_enabled = params->enable_11k;
-	}
-#endif
-
 	return wifi_mgmt_api->cfg_11k(dev, params);
 }