EHT: Indicate wifi_generation=7 in wpa_supplicant STATUS output

This adds wifi_generation=7 line to the STATUS output if the driver
reports (Re)Association Request frame and (Re)Association Response frame
information elements in the association or connection event with EHT
capability IEs.

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 70538b578b24c60a0e063e42f1c986cdb46ea5a4..4f9aa667acb16b45e049dac375334c52f5086462 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2312,11 +2312,12 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
 
                if (wpa_s->connection_set &&
                    (wpa_s->connection_ht || wpa_s->connection_vht ||
-                    wpa_s->connection_he)) {
+                    wpa_s->connection_he || wpa_s->connection_eht)) {
                        ret = os_snprintf(pos, end - pos,
                                          "wifi_generation=%u\n",
-                                         wpa_s->connection_he ? 6 :
-                                         (wpa_s->connection_vht ? 5 : 4));
+                                         wpa_s->connection_eht ? 7 :
+                                         (wpa_s->connection_he ? 6 :
+                                          (wpa_s->connection_vht ? 5 : 4)));
                        if (os_snprintf_error(end - pos, ret))
                                return pos - buf;
                        pos += ret;

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 81f4a5f43b45a8a98d4d0510b2502abfeb82ce03..0ce3d8fb0664b6af60274c886b4cd52fd90784ec 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2997,6 +2997,8 @@ static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
                                 BAND_2_4_GHZ);
                        wpa_s->connection_he = req_elems.he_capabilities &&
                                resp_elems.he_capabilities;
+                       wpa_s->connection_eht = req_elems.eht_capabilities &&
+                               resp_elems.eht_capabilities;
                }
        }
 

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 0ba352fcb20fb1972f37e64a4b36dace115634cf..504660e87ab2c871feec0a73abbcf58495c094a3 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -961,6 +961,7 @@ struct wpa_supplicant {
        unsigned int connection_ht:1;
        unsigned int connection_vht:1;
        unsigned int connection_he:1;
+       unsigned int connection_eht:1;
        unsigned int disable_mbo_oce:1;
 
        struct os_reltime last_mac_addr_change;