--- ../wicontrol.org/wicontrol.c	Sun Dec 21 21:15:55 2003
+++ wicontrol.c	Mon Dec 22 01:54:23 2003
@@ -53,6 +53,7 @@
 #include <net/if_ieee80211.h>
 #include <dev/wi/if_wavelan_ieee.h>
 #include <dev/wi/if_wireg.h>
+#define  WI_RID_CNFENHSEC 0xFC43
 
 #include <stdio.h>
 #include <string.h>
@@ -641,6 +642,7 @@
 	{ WI_RID_CARD_ID, WI_HEXWORDS, "Card ID register:\t\t\t" },
 	{ WI_RID_REG_DOMAINS, WI_REGDOMS, "Regulatory Domains:\t\t\t" },
 	{ WI_RID_TEMP_TYPE, WI_WORDS, "Temperature Range:\t\t\t" },
+	{ WI_RID_CNFENHSEC, WI_WORDS, "Enhanced SSID Security:\t\t\t" },
 #ifdef WI_EXTRA_INFO
 	{ WI_RID_PRI_SUP_RANGE, WI_WORDS, "PRI Sup Range:\t\t\t\t" },
 	{ WI_RID_CIF_ACT_RANGE, WI_WORDS, "CFI Act Sup Range:\t\t\t" },
@@ -840,6 +842,7 @@
 	fprintf(stderr, "\t%s -i iface -P 0|1\n", p);
 	fprintf(stderr, "\t%s -i iface -S max sleep duration\n", p);
 	fprintf(stderr, "\t%s -i iface -T 1|2|3|4\n", p);
+	fprintf(stderr, "\t%s -i iface -E 0|1|2|3\n" ,p);
 #ifdef WICACHE
 	fprintf(stderr, "\t%s -i iface -Z zero out signal cache\n", p);
 	fprintf(stderr, "\t%s -i iface -C print signal cache\n", p);
@@ -1027,7 +1030,7 @@
 	opterr = 1;
 		
 	while((ch = getopt(argc, argv,
-	    "a:c:d:e:f:hi:k:lm:n:op:q:r:s:t:v:CF:LP:QS:T:Z")) != -1) {
+	    "a:c:d:e:E:f:hi:k:lm:n:op:q:r:s:t:v:CF:LP:QS:T:Z")) != -1) {
 		switch(ch) {
 		case 'Z':
 #ifdef WICACHE
@@ -1063,6 +1066,13 @@
 			wi_setword(iface, WI_RID_ENCRYPTION, atoi(optarg));
 			exit(0);
 			break;
+		case 'E':
+			if (atoi(optarg) >= 0 && atoi(optarg) <=3) {
+				wi_setword(iface, WI_RID_CNFENHSEC, atoi(optarg));
+			}
+			else fprintf(stderr, "invalid option\n");
+			exit(0);
+			break; 
 		case 'f':
 			dep("f", "channel");
 			wi_setword(iface, WI_RID_OWN_CHNL, atoi(optarg));