Actually implement -a as documented since import (set access point density).

Remove documentation for short-lived usage as "print keys in ASCII."

PR:		bin/21803
MFC after:	1 week

2 files changed, 8 insertions, 9 deletions

diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 8c1301d..a1e757d 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -38,7 +38,7 @@
 .Nd configure WaveLAN/IEEE devices
 .Sh SYNOPSIS
 .Nm
-.Fl i Ar iface Op Fl oa
+.Fl i Ar iface Op Fl o
 .Nm
 .Fl i Ar iface Fl t Ar tx rate
 .Nm
@@ -106,7 +106,7 @@ as default.
 .Sh OPTIONS
 The options are as follows:
 .Bl -tag -width Fl
-.It Fl i Ar iface Op Fl oa
+.It Fl i Ar iface Op Fl o
 Display the current settings of the specified WaveLAN/IEEE interface.
 This retrieves the current card settings from the driver and prints them
 out.
@@ -114,12 +114,7 @@ Using the additional
 .Fl o
 flag will cause
 .Nm
-to print out the statistics counters instead of the card settings. Using
-the additional
-.Fl a
-flag will cause
-.Nm
-to print out encryption keys as ascii characters instead of in hex.
+to print out the statistics counters instead of the card settings.
 Encryption keys are only displayed if wicontrol is run as root.
 .It Fl i Ar iface Fl t Ar tx rate
 Set the transmit rate of the specified interface.
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 17c4a97..0cb76ab 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -715,7 +715,7 @@ int main(argc, argv)
 	opterr = 1;
 		
 	while((ch = getopt(argc, argv,
-	    "hoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
+	    "a:hoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
 		switch(ch) {
 		case 'Z':
 #ifdef WICACHE
@@ -797,6 +797,10 @@ int main(argc, argv)
 			wi_setword(iface, WI_RID_PM_ENABLED, atoi(optarg));
 			exit(0);
 			break;
+		case 'a':
+			wi_setword(iface, WI_RID_SYSTEM_SCALE, atoi(optarg));
+			exit(0);
+			break;
 		case 'v':
 			modifier = atoi(optarg);
 			modifier--;