6564957 WPA_STRSIZE needs to go

6564958 formatting glitches in <net/wpa.h>
6564959 unused structures adrift in <net/wpa.h>
6566819 IEEE802.11 header definitions should be centralized
6673764 wpad(1M) usage message incorrectly references wpa_supplicant
6673772 Additional instances of wpad(1M) dump core at startup
6685997 kstat -m opackets is zero of ral driver
6685998 net80211 header files hdrchk warnings

1 files changed, 38 insertions, 89 deletions

diff --git a/usr/src/uts/common/net/wpa.h b/usr/src/uts/common/net/wpa.h
index 08e8342744..f57c0ab9de 100644
--- a/usr/src/uts/common/net/wpa.h
+++ b/usr/src/uts/common/net/wpa.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,103 +32,72 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include <sys/types.h>
 #include <inet/wifi_ioctl.h>
+#include <sys/net80211_crypto.h>
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-#define	SERVICE_NAME			"network/wpa"
-#define	WPA_DOOR 			"/var/run/wpa_door"
-#define	SVC_METHOD			"/usr/lib/inet/wpad"
-
-#define	IEEE80211_ADDR_LEN		6
-#define	IEEE80211_MAX_WPA_IE		40	/* IEEE802.11i */
-#define	WPA_STRSIZE			256
-/*
- * Max size of optional information elements.  We artificially
- * constrain this; it's limited only by the max frame size (and
- * the max parameter size of the wireless extensions).
- */
-#define	IEEE80211_MAX_OPT_IE		256
+#define	SERVICE_NAME		"network/wpa"
+#define	WPA_DOOR 		"/var/run/wpa_door"
+#define	SVC_METHOD		"/usr/lib/inet/wpad"
 
 /*
  * Parameters.
- * WL_WPA_BASE + 0x1, 5, 6 reserved to be compatible with FreeBSD.
  */
-#define	WL_WPA_BASE			(WL_PARAMETERS_BASE + 0x500)
-#define	WL_SETOPTIE			(WL_WPA_BASE + 0x0)
-#define	WL_WPA				(WL_WPA_BASE + 0x2)
-#define	WL_KEY				(WL_WPA_BASE + 0x3)
-#define	WL_DELKEY			(WL_WPA_BASE + 0x4)
-#define	WL_SCANRESULTS			(WL_WPA_BASE + 0x7)
-#define	WL_MLME				(WL_WPA_BASE + 0x8)
-#define	WL_CAPABILITY			(WL_WPA_BASE + 0x9)
+#define	WL_WPA_BASE		(WL_PARAMETERS_BASE + 0x500)
+#define	WL_SETOPTIE		(WL_WPA_BASE + 0x0)
+#define	WL_WPA			(WL_WPA_BASE + 0x2)
+#define	WL_KEY			(WL_WPA_BASE + 0x3)
+#define	WL_DELKEY		(WL_WPA_BASE + 0x4)
+#define	WL_SCANRESULTS		(WL_WPA_BASE + 0x7)
+#define	WL_MLME			(WL_WPA_BASE + 0x8)
+#define	WL_CAPABILITY		(WL_WPA_BASE + 0x9)
 
 typedef struct wl_wpa_ie {
-    uint32_t	wpa_ie_len;
-    char 	wpa_ie[1];	/* it's the head of wpa_ie */
+	uint32_t	wpa_ie_len;
+	char		wpa_ie[1];	/* it's the head of wpa_ie */
 } wl_wpa_ie_t;
 
 typedef struct wl_wpa {
-    uint32_t	wpa_flag;
+	uint32_t	wpa_flag;
 } wl_wpa_t;
 
 typedef struct wl_capability {
-    uint32_t	caps;
+	uint32_t	caps;
 } wl_capability_t;
 
-#define	IEEE80211_KEYBUF_SIZE		16	/* 128-bit TKIP & CCMP key */
-#define	IEEE80211_MICBUF_SIZE		(8+8)	/* 8 byte tx, 8 byte rx */
-
-/*
- * NB: these values are ordered carefully; there are lots of
- * of implications in any reordering.  In particular beware
- * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
- */
-#define	IEEE80211_CIPHER_WEP		0
-#define	IEEE80211_CIPHER_TKIP		1
-#define	IEEE80211_CIPHER_AES_OCB	2
-#define	IEEE80211_CIPHER_AES_CCM	3
-#define	IEEE80211_CIPHER_CKIP		4
-#define	IEEE80211_CIPHER_NONE		5	/* pseudo value */
-
-#define	IEEE80211_CIPHER_MAX		(IEEE80211_CIPHER_NONE+1)
-
-/* Key Flags */
-#define	IEEE80211_KEY_XMIT		0x01	/* key used for xmit */
-#define	IEEE80211_KEY_RECV		0x02	/* key used for recv */
-
-#define	IEEE80211_KEY_DEFAULT		0x80	/* default xmit key */
-
 /*
- * WPA/RSN get/set key request.  Specify the key/cipher
- * type and whether the key is to be used for sending and/or
- * receiving.  The key index should be set only when working
- * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
- * Otherwise a unicast/pairwise key is specified by the bssid
- * (on a station) or mac address (on an ap).  They key length
- * must include any MIC key data; otherwise it should be no
- * more than IEEE80211_KEYBUF_SIZE.
+ * WPA/RSN get/set key request.
+ * ik_type  : wep/tkip/aes
+ * ik_keyix : should be between 0 and 3, 0 will be used as default key.
+ * ik_keylen: key length in bytes.
+ * ik_keydata and ik_keylen include the DATA key and MIC key.
+ * ik_keyrsc/ik_keytsc: rx/tx seq number.
  */
 #pragma pack(1)
 typedef struct wl_key {
-	uint8_t		ik_type;	/* key/cipher type */
+	uint8_t		ik_type;
 	uint8_t		ik_pad;
 
-	uint16_t	ik_keyix;	/* key index */
-	uint8_t		ik_keylen;	/* key length in bytes */
+	uint16_t	ik_keyix;
+	uint8_t		ik_keylen;
 	uint8_t		ik_flags;
 
 	uint8_t		ik_macaddr[IEEE80211_ADDR_LEN];
-	uint64_t	ik_keyrsc;	/* key receive sequence counter */
-	uint64_t	ik_keytsc;	/* key transmit sequence counter */
+	uint64_t	ik_keyrsc;
+	uint64_t	ik_keytsc;
 
 	uint8_t ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
 } wl_key_t;
 #pragma pack()
 
+typedef struct wl_del_key {
+	uint8_t		idk_keyix;
+	uint8_t		idk_macaddr[IEEE80211_ADDR_LEN];
+} wl_del_key_t;
+
 struct wpa_ess {
 	uint8_t		bssid[IEEE80211_ADDR_LEN];
 	uint8_t		ssid[MAX_ESSID_LENGTH];
@@ -139,39 +108,19 @@ struct wpa_ess {
 	int		freq;
 };
 
-typedef struct wl_del_key {
-	uint8_t		idk_keyix;	/* key index */
-	uint8_t		idk_macaddr[IEEE80211_ADDR_LEN];
-}wl_del_key_t;
-
-typedef struct wl_countermeasures {
-	uint32_t	cm_flag;
-} wl_countermeasures_t;
-
-typedef struct wl_drop_unenc {
-	uint32_t	drop_flag;
-} wl_drop_unenc_t;
-
 typedef struct wl_wpa_ess {
 	uint32_t	count;
 	struct wpa_ess	ess[1];
 } wl_wpa_ess_t;
 
-#define	IEEE80211_MLME_ASSOC		1	/* associate station */
-#define	IEEE80211_MLME_DISASSOC		2	/* disassociate station */
-#define	IEEE80211_MLME_DEAUTH		3	/* deauthenticate station */
-#define	IEEE80211_MLME_AUTHORIZE	4	/* authorize station */
-#define	IEEE80211_MLME_UNAUTHORIZE	5	/* unauthorize station */
-
 /*
- *  * MLME state manipulation request.  IEEE80211_MLME_ASSOC
- *   * only makes sense when operating as a station.  The other
- *    * requests can be used when operating as a station or an
- *     * ap (to effect a station).
+ * structure for WL_MLME state manipulation request.
+ * im_op: operations include auth/deauth/assoc/disassoc,
+ * im_reason: 802.11 reason code
  */
 typedef struct wl_mlme {
-	uint8_t		im_op;		/* operation to perform */
-	uint16_t	im_reason;	/* 802.11 reason code */
+	uint8_t		im_op;
+	uint16_t	im_reason;
 	uint8_t		im_macaddr[IEEE80211_ADDR_LEN];
 } wl_mlme_t;