Close PR# 21843 and PR# 21864. This adds support for WEP and updates some

of the data structures to include new members that weren't defined in the
manual I have.

I opted to use Doug Ambrisko's WEP patches since David Cornejo's patches
did not include the necessary changes to ancontrol(8) to actually enable
and use WEP.

NOTE: I don't currently have access to an Aironet card, so I can't test
any of this. Everything compiles and close scrutiny doesn't reveal any
obvious problems, but Murphy's Law applies. This means I will probably
leave these changes in -current for a bit longer than usual until I'm
sure they work right.

1 files changed, 39 insertions, 3 deletions

diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index aa86978..680a676 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -151,6 +151,15 @@ struct an_sigcache {
 };
 #endif
 
+struct an_ltv_key {
+	u_int16_t	an_len;
+	u_int16_t	an_type;
+	u_int16_t       kindex;
+	u_int8_t        mac[6];
+	u_int16_t       klen;
+	u_int8_t        key[16];  /* 40-bit keys */
+};
+
 #ifndef _KERNEL
 struct an_ltv_stats {
 	u_int16_t		an_fudge;
@@ -312,7 +321,10 @@ struct an_ltv_genconfig {
 	u_int16_t		an_diversity;		/* 0x72 */
 	u_int16_t		an_tx_power;		/* 0x74 */
 	u_int16_t		an_rss_thresh;		/* 0x76 */
-	u_int16_t		an_rsvd6[4];		/* 0x78 */
+	u_int16_t		an_modulation_type;	/* 0x78 */
+	u_int16_t		an_short_preamble;	/* 0x7A */
+	u_int16_t		an_home_product;	/* 0x7C */
+	u_int16_t		an_rsvd6;		/* 0x7E */
 	/* Aironet extensions. */
 	u_int8_t		an_nodename[16];	/* 0x80 */
 	u_int16_t		an_arl_thresh;		/* 0x90 */
@@ -357,6 +369,8 @@ struct an_ltv_genconfig {
 #define AN_AUTHTYPE_OPEN			0x0001
 #define AN_AUTHTYPE_SHAREDKEY			0x0002
 #define AN_AUTHTYPE_EXCLUDE_UNENCRYPTED		0x0004
+#define AN_AUTHTYPE_MASK                        0x00ff
+#define AN_AUTHTYPE_ENABLE			0x0100
 
 #define AN_PSAVE_NONE				0x0000
 #define AN_PSAVE_CAM				0x0001
@@ -459,6 +473,7 @@ struct an_ltv_caps {
 	u_int16_t		an_ifacerev;		/* 0x7A */
 	u_int16_t		an_softcaps;		/* 0x7C */
 	u_int16_t		an_bootblockrev;	/* 0x7E */
+	u_int16_t		an_req_hw_support;	/* 0x80 */
 };
 
 struct an_ltv_apinfo {
@@ -480,7 +495,7 @@ struct an_ltv_status {
 	u_int8_t		an_macaddr[6];		/* 0x02 */
 	u_int16_t		an_opmode;		/* 0x08 */
 	u_int16_t		an_errcode;		/* 0x0A */
-	u_int16_t		an_cur_signal_quality;	/* 0x0C */
+	u_int16_t		an_cur_signal_strength;	/* 0x0C */
 	u_int16_t		an_ssidlen;		/* 0x0E */
 	u_int8_t		an_ssid[32];		/* 0x10 */
 	u_int8_t		an_ap_name[16];		/* 0x30 */
@@ -498,7 +513,16 @@ struct an_ltv_status {
 	u_int16_t		an_ap_total_load;	/* 0x66 */
 	u_int16_t		an_our_generated_load;	/* 0x68 */
 	u_int16_t		an_accumulated_arl;	/* 0x6A */
-	u_int16_t		an_rsvd0;		/* 0x6C */
+	u_int16_t		an_cur_signal_quality;	/* 0x6C */
+	u_int16_t		an_current_tx_rate;	/* 0x6E */
+	u_int16_t		an_ap_device;		/* 0x70 */
+	u_int16_t		an_normalized_rssi;	/* 0x72 */ 
+	u_int16_t		an_short_pre_in_use;	/* 0x74 */
+	u_int8_t		an_ap_ip_addr[4];	/* 0x76 */
+	u_int16_t		an_max_noise_prev_sec;	/* 0x7A */
+	u_int16_t		an_avg_noise_prev_min;	/* 0x7C */
+	u_int16_t		an_max_noise_prev_min;	/* 0x7E */
+	u_int16_t		an_spare[2];
 };
 
 #define AN_STATUS_OPMODE_CONFIGURED		0x0001
@@ -508,6 +532,14 @@ struct an_ltv_status {
 #define AN_STATUS_OPMODE_ASSOCIATED		0x0020
 #define AN_STATUS_OPMODE_ERROR			0x8000
 
+struct an_ltv_wepkey {
+	u_int16_t		an_len;			/* 0x00 */
+	u_int16_t		an_type;		/* 0xXX */
+	u_int16_t		an_key_index;		/* 0x02 */
+	u_int8_t		an_mac_addr[6];		/* 0x04 */
+	u_int16_t		an_key_len;		/* 0x0A */
+	u_int8_t		an_key[13];		/* 0x0C */
+};
 
 /*
  * These are all the LTV record types that we can read or write
@@ -523,7 +555,11 @@ struct an_ltv_status {
 #define AN_RID_APLIST		0xFF12	/* Valid AP list */
 #define AN_RID_DRVNAME		0xFF13	/* ID name of this node for diag */
 #define AN_RID_ENCAPPROTO	0xFF14	/* Payload encapsulation type */
+#define AN_RID_WEP_TEMP	        0xFF15  /* Temporary Key */
+#define AN_RID_WEP_PERM	        0xFF16  /* Perminant Key */
 #define AN_RID_ACTUALCFG	0xFF20	/* Current configuration settings */
+#define AN_RID_WEP_VOLATILE	0xFF15	/* Volatile WEP Key */
+#define AN_RID_WEP_PERSISTENT	0xFF16	/* Persistent WEP Key */
 
 /*
  * Reporting (read only)