cli: support reporting VHT rates

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/iwinfo_cli.c b/iwinfo_cli.c
index 7cb90c22c5de8bc302ebb18f89de067e1270ab50..aab6ae6598b9f828ddc02512dded5173045ac56e 100644 (file)
--- a/iwinfo_cli.c
+++ b/iwinfo_cli.c
@@ -280,7 +280,7 @@ static char * format_hwmodes(int modes)
 
 static char * format_assocrate(struct iwinfo_rate_entry *r)
 {
-       static char buf[40];
+       static char buf[80];
        char *p = buf;
        int l = sizeof(buf);
 
@@ -293,13 +293,21 @@ static char * format_assocrate(struct iwinfo_rate_entry *r)
                p += snprintf(p, l, "%s", format_rate(r->rate));
                l = sizeof(buf) - (p - buf);
 
-               if (r->mcs >= 0)
+               if (r->is_ht)
                {
-                       p += snprintf(p, l, ", MCS %d, %dMHz", r->mcs, 20 + r->is_40mhz*20);
+                       p += snprintf(p, l, ", MCS %d, %dMHz", r->mcs, r->mhz);
+                       l = sizeof(buf) - (p - buf);
+               }
+               else if (r->is_vht)
+               {
+                       p += snprintf(p, l, ", VHT-MCS %d, %dMHz", r->mcs, r->mhz);
                        l = sizeof(buf) - (p - buf);
 
-                       if (r->is_short_gi)
-                               p += snprintf(p, l, ", short GI");
+                       if (r->nss)
+                       {
+                               p += snprintf(p, l, ", VHT-NSS %d", r->nss);
+                               l = sizeof(buf) - (p - buf);
+                       }
                }
        }