mesh: Use mesh id instead of SSID in BSS table

Signed-off-by: Javier Lopez <jlopex@gmail.com>
Signed-off-by: Jason Abele <jason.abele@gmail.com>

diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c
index 7d01a5f..9b9289f 100644 (file)
--- a/wpa_supplicant/bss.c
+++ b/wpa_supplicant/bss.c
@@ -593,7 +593,7 @@ void wpa_bss_update_scan_res(struct wpa_supplicant *wpa_s,
                             struct wpa_scan_res *res,
                             struct os_reltime *fetch_time)
 {
-       const u8 *ssid, *p2p;
+       const u8 *ssid, *p2p, *mesh;
        struct wpa_bss *bss;
 
        if (wpa_s->conf->ignore_old_scan_res) {
@@ -643,6 +643,11 @@ void wpa_bss_update_scan_res(struct wpa_supplicant *wpa_s,
 
        /* TODO: add option for ignoring BSSes we are not interested in
         * (to save memory) */
+
+       mesh = wpa_scan_get_ie(res, WLAN_EID_MESH_ID);
+       if (mesh && mesh[1] <= 32)
+               ssid = mesh;
+
        bss = wpa_bss_get(wpa_s, res->bssid, ssid + 2, ssid[1]);
        if (bss == NULL)
                bss = wpa_bss_add(wpa_s, ssid + 2, ssid[1], res, fetch_time);