From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 25 Jan 2016 14:02:50 +0000 (+0100)
Subject: cli: support reporting VHT rates
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78f0fafa591754c3c5bbd3f408a0a91b78690141;p=oweals%2Fiwinfo.git

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 7cb90c2..aab6ae6 100644
--- 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);
+			}
 		}
 	}