X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fiwinfo%2Fsrc%2Fiwinfo.lua;h=4a982dd99454da376960351cd6e83fc13b45fe75;hp=76b9e4ad1f7df1eb3e192d9fbb77eb3028a1f454;hb=6ef55ba3276ba85cb30d07c528266d92067725d4;hpb=66736c857476550c68720a4cf933ab2f6d04031d

diff --git a/contrib/package/iwinfo/src/iwinfo.lua b/contrib/package/iwinfo/src/iwinfo.lua
index 76b9e4ad1..4a982dd99 100755
--- a/contrib/package/iwinfo/src/iwinfo.lua
+++ b/contrib/package/iwinfo/src/iwinfo.lua
@@ -26,14 +26,31 @@ function print_info(api, dev)
 	local iw = iwinfo[api]
 	local enc = iw.encryption(dev)
 
-	printf("%-9s Type: %s  ESSID: \"%s\"",
-		dev, api, s(iw.ssid(dev)))
+	local function hwmode()
+		local m = iw.hwmodelist(dev)
+		if m then
+			local s = "802.11"
+			if m.a then s = s.."a" end
+			if m.b then s = s.."b" end
+			if m.g then s = s.."g" end
+			if m.n then s = s.."n" end
+			return s
+		else
+			return "?"
+		end
+	end
+
+	printf("%-9s ESSID: \"%s\"",
+		dev, s(iw.ssid(dev)))
 
 	printf("          Access Point: %s",
 		s(iw.bssid(dev)))
 
+	printf("          Type: %s  HW Mode(s): %s",
+		api, hwmode())
+
 	printf("          Mode: %s  Channel: %d (%.3f GHz)",
-		iw.mode(dev), n(iw.channel(dev)), n(iw.frequency(dev)) / 1000)
+		s(iw.mode(dev)), n(iw.channel(dev)), n(iw.frequency(dev)) / 1000)
 
 	printf("          Tx-Power: %s dBm  Link Quality: %s/%s",
 		s(iw.txpower(dev)), s(iw.quality(dev)), s(iw.quality_max(dev)))
@@ -45,7 +62,10 @@ function print_info(api, dev)
 		n(iw.bitrate(dev)) / 1000)
 
 	printf("          Encryption: %s",
-		s(enc and enc.description))
+		s(enc and enc.description or "None"))
+
+	printf("          Supports VAPs: %s",
+		iw.mbssid_support(dev) and "yes" or "no")
 
 	print("")
 end
@@ -68,7 +88,7 @@ function print_scan(api, dev)
 				s(se.signal), n(se.quality), n(se.quality_max))
 
 			printf("          Encryption: %s",
-				s(se.encryption.description))
+				s(se.encryption.description or "None"))
 
 			print("")
 		end