Update 802.11 wireless support:

o major overhaul of the way channels are handled: channels are now
  fully enumerated and uniquely identify the operating characteristics;
  these changes are visible to user applications which require changes
o make scanning support independent of the state machine to enable
  background scanning and roaming
o move scanning support into loadable modules based on the operating
  mode to enable different policies and reduce the memory footprint
  on systems w/ constrained resources
o add background scanning in station mode (no support for adhoc/ibss
  mode yet)
o significantly speedup sta mode scanning with a variety of techniques
o add roaming support when background scanning is supported; for now
  we use a simple algorithm to trigger a roam: we threshold the rssi
  and tx rate, if either drops too low we try to roam to a new ap
o add tx fragmentation support
o add first cut at 802.11n support: this code works with forthcoming
  drivers but is incomplete; it's included now to establish a baseline
  for other drivers to be developed and for user applications
o adjust max_linkhdr et. al. to reflect 802.11 requirements; this eliminates
  prepending mbufs for traffic generated locally
o add support for Atheros protocol extensions; mainly the fast frames
  encapsulation (note this can be used with any card that can tx+rx
  large frames correctly)
o add sta support for ap's that beacon both WPA1+2 support
o change all data types from bsd-style to posix-style
o propagate noise floor data from drivers to net80211 and on to user apps
o correct various issues in the sta mode state machine related to handling
  authentication and association failures
o enable the addition of sta mode power save support for drivers that need
  net80211 support (not in this commit)
o remove old WI compatibility ioctls (wicontrol is officially dead)
o change the data structures returned for get sta info and get scan
  results so future additions will not break user apps
o fixed tx rate is now maintained internally as an ieee rate and not an
  index into the rate set; this needs to be extended to deal with
  multi-mode operation
o add extended channel specifications to radiotap to enable 11n sniffing

Drivers:
o ath: add support for bg scanning, tx fragmentation, fast frames,
       dynamic turbo (lightly tested), 11n (sniffing only and needs
       new hal)
o awi: compile tested only
o ndis: lightly tested
o ipw: lightly tested
o iwi: add support for bg scanning (well tested but may have some
       rough edges)
o ral, ural, rum: add suppoort for bg scanning, calibrate rssi data
o wi: lightly tested

This work is based on contributions by Atheros, kmacy, sephe, thompsa,
mlaier, kevlo, and others.  Much of the scanning work was supported by
Atheros.  The 11n work was supported by Marvell.

1 files changed, 236 insertions, 188 deletions

diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h
index 28dba03..2e17000 100644
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.h
@@ -39,146 +39,158 @@
  * Per/node (station) statistics.
  */
 struct ieee80211_nodestats {
-	u_int32_t	ns_rx_data;		/* rx data frames */
-	u_int32_t	ns_rx_mgmt;		/* rx management frames */
-	u_int32_t	ns_rx_ctrl;		/* rx control frames */
-	u_int32_t	ns_rx_ucast;		/* rx unicast frames */
-	u_int32_t	ns_rx_mcast;		/* rx multi/broadcast frames */
-	u_int64_t	ns_rx_bytes;		/* rx data count (bytes) */
-	u_int64_t	ns_rx_beacons;		/* rx beacon frames */
-	u_int32_t	ns_rx_proberesp;	/* rx probe response frames */
+	uint32_t	ns_rx_data;		/* rx data frames */
+	uint32_t	ns_rx_mgmt;		/* rx management frames */
+	uint32_t	ns_rx_ctrl;		/* rx control frames */
+	uint32_t	ns_rx_ucast;		/* rx unicast frames */
+	uint32_t	ns_rx_mcast;		/* rx multi/broadcast frames */
+	uint64_t	ns_rx_bytes;		/* rx data count (bytes) */
+	uint64_t	ns_rx_beacons;		/* rx beacon frames */
+	uint32_t	ns_rx_proberesp;	/* rx probe response frames */
 
-	u_int32_t	ns_rx_dup;		/* rx discard 'cuz dup */
-	u_int32_t	ns_rx_noprivacy;	/* rx w/ wep but privacy off */
-	u_int32_t	ns_rx_wepfail;		/* rx wep processing failed */
-	u_int32_t	ns_rx_demicfail;	/* rx demic failed */
-	u_int32_t	ns_rx_decap;		/* rx decapsulation failed */
-	u_int32_t	ns_rx_defrag;		/* rx defragmentation failed */
-	u_int32_t	ns_rx_disassoc;		/* rx disassociation */
-	u_int32_t	ns_rx_deauth;		/* rx deauthentication */
-	u_int32_t	ns_rx_decryptcrc;	/* rx decrypt failed on crc */
-	u_int32_t	ns_rx_unauth;		/* rx on unauthorized port */
-	u_int32_t	ns_rx_unencrypted;	/* rx unecrypted w/ privacy */
+	uint32_t	ns_rx_dup;		/* rx discard 'cuz dup */
+	uint32_t	ns_rx_noprivacy;	/* rx w/ wep but privacy off */
+	uint32_t	ns_rx_wepfail;		/* rx wep processing failed */
+	uint32_t	ns_rx_demicfail;	/* rx demic failed */
+	uint32_t	ns_rx_decap;		/* rx decapsulation failed */
+	uint32_t	ns_rx_defrag;		/* rx defragmentation failed */
+	uint32_t	ns_rx_disassoc;		/* rx disassociation */
+	uint32_t	ns_rx_deauth;		/* rx deauthentication */
+	uint32_t	ns_rx_action;		/* rx action */
+	uint32_t	ns_rx_decryptcrc;	/* rx decrypt failed on crc */
+	uint32_t	ns_rx_unauth;		/* rx on unauthorized port */
+	uint32_t	ns_rx_unencrypted;	/* rx unecrypted w/ privacy */
 
-	u_int32_t	ns_tx_data;		/* tx data frames */
-	u_int32_t	ns_tx_mgmt;		/* tx management frames */
-	u_int32_t	ns_tx_ucast;		/* tx unicast frames */
-	u_int32_t	ns_tx_mcast;		/* tx multi/broadcast frames */
-	u_int64_t	ns_tx_bytes;		/* tx data count (bytes) */
-	u_int32_t	ns_tx_probereq;		/* tx probe request frames */
+	uint32_t	ns_tx_data;		/* tx data frames */
+	uint32_t	ns_tx_mgmt;		/* tx management frames */
+	uint32_t	ns_tx_ucast;		/* tx unicast frames */
+	uint32_t	ns_tx_mcast;		/* tx multi/broadcast frames */
+	uint64_t	ns_tx_bytes;		/* tx data count (bytes) */
+	uint32_t	ns_tx_probereq;		/* tx probe request frames */
 
-	u_int32_t	ns_tx_novlantag;	/* tx discard 'cuz no tag */
-	u_int32_t	ns_tx_vlanmismatch;	/* tx discard 'cuz bad tag */
+	uint32_t	ns_tx_novlantag;	/* tx discard 'cuz no tag */
+	uint32_t	ns_tx_vlanmismatch;	/* tx discard 'cuz bad tag */
 
-	u_int32_t	ns_ps_discard;		/* ps discard 'cuz of age */
+	uint32_t	ns_ps_discard;		/* ps discard 'cuz of age */
 
 	/* MIB-related state */
-	u_int32_t	ns_tx_assoc;		/* [re]associations */
-	u_int32_t	ns_tx_assoc_fail;	/* [re]association failures */
-	u_int32_t	ns_tx_auth;		/* [re]authentications */
-	u_int32_t	ns_tx_auth_fail;	/* [re]authentication failures*/
-	u_int32_t	ns_tx_deauth;		/* deauthentications */
-	u_int32_t	ns_tx_deauth_code;	/* last deauth reason */
-	u_int32_t	ns_tx_disassoc;		/* disassociations */
-	u_int32_t	ns_tx_disassoc_code;	/* last disassociation reason */
+	uint32_t	ns_tx_assoc;		/* [re]associations */
+	uint32_t	ns_tx_assoc_fail;	/* [re]association failures */
+	uint32_t	ns_tx_auth;		/* [re]authentications */
+	uint32_t	ns_tx_auth_fail;	/* [re]authentication failures*/
+	uint32_t	ns_tx_deauth;		/* deauthentications */
+	uint32_t	ns_tx_deauth_code;	/* last deauth reason */
+	uint32_t	ns_tx_disassoc;		/* disassociations */
+	uint32_t	ns_tx_disassoc_code;	/* last disassociation reason */
 };
 
 /*
  * Summary statistics.
  */
 struct ieee80211_stats {
-	u_int32_t	is_rx_badversion;	/* rx frame with bad version */
-	u_int32_t	is_rx_tooshort;		/* rx frame too short */
-	u_int32_t	is_rx_wrongbss;		/* rx from wrong bssid */
-	u_int32_t	is_rx_dup;		/* rx discard 'cuz dup */
-	u_int32_t	is_rx_wrongdir;		/* rx w/ wrong direction */
-	u_int32_t	is_rx_mcastecho;	/* rx discard 'cuz mcast echo */
-	u_int32_t	is_rx_notassoc;		/* rx discard 'cuz sta !assoc */
-	u_int32_t	is_rx_noprivacy;	/* rx w/ wep but privacy off */
-	u_int32_t	is_rx_unencrypted;	/* rx w/o wep and privacy on */
-	u_int32_t	is_rx_wepfail;		/* rx wep processing failed */
-	u_int32_t	is_rx_decap;		/* rx decapsulation failed */
-	u_int32_t	is_rx_mgtdiscard;	/* rx discard mgt frames */
-	u_int32_t	is_rx_ctl;		/* rx discard ctrl frames */
-	u_int32_t	is_rx_beacon;		/* rx beacon frames */
-	u_int32_t	is_rx_rstoobig;		/* rx rate set truncated */
-	u_int32_t	is_rx_elem_missing;	/* rx required element missing*/
-	u_int32_t	is_rx_elem_toobig;	/* rx element too big */
-	u_int32_t	is_rx_elem_toosmall;	/* rx element too small */
-	u_int32_t	is_rx_elem_unknown;	/* rx element unknown */
-	u_int32_t	is_rx_badchan;		/* rx frame w/ invalid chan */
-	u_int32_t	is_rx_chanmismatch;	/* rx frame chan mismatch */
-	u_int32_t	is_rx_nodealloc;	/* rx frame dropped */
-	u_int32_t	is_rx_ssidmismatch;	/* rx frame ssid mismatch  */
-	u_int32_t	is_rx_auth_unsupported;	/* rx w/ unsupported auth alg */
-	u_int32_t	is_rx_auth_fail;	/* rx sta auth failure */
-	u_int32_t	is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */
-	u_int32_t	is_rx_assoc_bss;	/* rx assoc from wrong bssid */
-	u_int32_t	is_rx_assoc_notauth;	/* rx assoc w/o auth */
-	u_int32_t	is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
-	u_int32_t	is_rx_assoc_norate;	/* rx assoc w/ no rate match */
-	u_int32_t	is_rx_assoc_badwpaie;	/* rx assoc w/ bad WPA IE */
-	u_int32_t	is_rx_deauth;		/* rx deauthentication */
-	u_int32_t	is_rx_disassoc;		/* rx disassociation */
-	u_int32_t	is_rx_badsubtype;	/* rx frame w/ unknown subtype*/
-	u_int32_t	is_rx_nobuf;		/* rx failed for lack of buf */
-	u_int32_t	is_rx_decryptcrc;	/* rx decrypt failed on crc */
-	u_int32_t	is_rx_ahdemo_mgt;	/* rx discard ahdemo mgt frame*/
-	u_int32_t	is_rx_bad_auth;		/* rx bad auth request */
-	u_int32_t	is_rx_unauth;		/* rx on unauthorized port */
-	u_int32_t	is_rx_badkeyid;		/* rx w/ incorrect keyid */
-	u_int32_t	is_rx_ccmpreplay;	/* rx seq# violation (CCMP) */
-	u_int32_t	is_rx_ccmpformat;	/* rx format bad (CCMP) */
-	u_int32_t	is_rx_ccmpmic;		/* rx MIC check failed (CCMP) */
-	u_int32_t	is_rx_tkipreplay;	/* rx seq# violation (TKIP) */
-	u_int32_t	is_rx_tkipformat;	/* rx format bad (TKIP) */
-	u_int32_t	is_rx_tkipmic;		/* rx MIC check failed (TKIP) */
-	u_int32_t	is_rx_tkipicv;		/* rx ICV check failed (TKIP) */
-	u_int32_t	is_rx_badcipher;	/* rx failed 'cuz key type */
-	u_int32_t	is_rx_nocipherctx;	/* rx failed 'cuz key !setup */
-	u_int32_t	is_rx_acl;		/* rx discard 'cuz acl policy */
-	u_int32_t	is_tx_nobuf;		/* tx failed for lack of buf */
-	u_int32_t	is_tx_nonode;		/* tx failed for no node */
-	u_int32_t	is_tx_unknownmgt;	/* tx of unknown mgt frame */
-	u_int32_t	is_tx_badcipher;	/* tx failed 'cuz key type */
-	u_int32_t	is_tx_nodefkey;		/* tx failed 'cuz no defkey */
-	u_int32_t	is_tx_noheadroom;	/* tx failed 'cuz no space */
-	u_int32_t	is_tx_fragframes;	/* tx frames fragmented */
-	u_int32_t	is_tx_frags;		/* tx fragments created */
-	u_int32_t	is_scan_active;		/* active scans started */
-	u_int32_t	is_scan_passive;	/* passive scans started */
-	u_int32_t	is_node_timeout;	/* nodes timed out inactivity */
-	u_int32_t	is_crypto_nomem;	/* no memory for crypto ctx */
-	u_int32_t	is_crypto_tkip;		/* tkip crypto done in s/w */
-	u_int32_t	is_crypto_tkipenmic;	/* tkip en-MIC done in s/w */
-	u_int32_t	is_crypto_tkipdemic;	/* tkip de-MIC done in s/w */
-	u_int32_t	is_crypto_tkipcm;	/* tkip counter measures */
-	u_int32_t	is_crypto_ccmp;		/* ccmp crypto done in s/w */
-	u_int32_t	is_crypto_wep;		/* wep crypto done in s/w */
-	u_int32_t	is_crypto_setkey_cipher;/* cipher rejected key */
-	u_int32_t	is_crypto_setkey_nokey;	/* no key index for setkey */
-	u_int32_t	is_crypto_delkey;	/* driver key delete failed */
-	u_int32_t	is_crypto_badcipher;	/* unknown cipher */
-	u_int32_t	is_crypto_nocipher;	/* cipher not available */
-	u_int32_t	is_crypto_attachfail;	/* cipher attach failed */
-	u_int32_t	is_crypto_swfallback;	/* cipher fallback to s/w */
-	u_int32_t	is_crypto_keyfail;	/* driver key alloc failed */
-	u_int32_t	is_crypto_enmicfail;	/* en-MIC failed */
-	u_int32_t	is_ibss_capmismatch;	/* merge failed-cap mismatch */
-	u_int32_t	is_ibss_norate;		/* merge failed-rate mismatch */
-	u_int32_t	is_ps_unassoc;		/* ps-poll for unassoc. sta */
-	u_int32_t	is_ps_badaid;		/* ps-poll w/ incorrect aid */
-	u_int32_t	is_ps_qempty;		/* ps-poll w/ nothing to send */
-	u_int32_t	is_ff_badhdr;		/* fast frame rx'd w/ bad hdr */
-	u_int32_t	is_ff_tooshort;		/* fast frame rx decap error */
-	u_int32_t	is_ff_split;		/* fast frame rx split error */
-	u_int32_t	is_ff_decap;		/* fast frames decap'd */
-	u_int32_t	is_ff_encap;		/* fast frames encap'd for tx */
-	u_int32_t	is_rx_badbintval;	/* rx frame w/ bogus bintval */
-	u_int32_t	is_rx_demicfail;	/* rx demic failed */
-	u_int32_t	is_rx_defrag;		/* rx defragmentation failed */
-	u_int32_t	is_rx_mgmt;		/* rx management frames */
-	u_int32_t	is_spare[6];
+	uint32_t	is_rx_badversion;	/* rx frame with bad version */
+	uint32_t	is_rx_tooshort;		/* rx frame too short */
+	uint32_t	is_rx_wrongbss;		/* rx from wrong bssid */
+	uint32_t	is_rx_dup;		/* rx discard 'cuz dup */
+	uint32_t	is_rx_wrongdir;		/* rx w/ wrong direction */
+	uint32_t	is_rx_mcastecho;	/* rx discard 'cuz mcast echo */
+	uint32_t	is_rx_notassoc;		/* rx discard 'cuz sta !assoc */
+	uint32_t	is_rx_noprivacy;	/* rx w/ wep but privacy off */
+	uint32_t	is_rx_unencrypted;	/* rx w/o wep and privacy on */
+	uint32_t	is_rx_wepfail;		/* rx wep processing failed */
+	uint32_t	is_rx_decap;		/* rx decapsulation failed */
+	uint32_t	is_rx_mgtdiscard;	/* rx discard mgt frames */
+	uint32_t	is_rx_ctl;		/* rx discard ctrl frames */
+	uint32_t	is_rx_beacon;		/* rx beacon frames */
+	uint32_t	is_rx_rstoobig;		/* rx rate set truncated */
+	uint32_t	is_rx_elem_missing;	/* rx required element missing*/
+	uint32_t	is_rx_elem_toobig;	/* rx element too big */
+	uint32_t	is_rx_elem_toosmall;	/* rx element too small */
+	uint32_t	is_rx_elem_unknown;	/* rx element unknown */
+	uint32_t	is_rx_badchan;		/* rx frame w/ invalid chan */
+	uint32_t	is_rx_chanmismatch;	/* rx frame chan mismatch */
+	uint32_t	is_rx_nodealloc;	/* rx frame dropped */
+	uint32_t	is_rx_ssidmismatch;	/* rx frame ssid mismatch  */
+	uint32_t	is_rx_auth_unsupported;	/* rx w/ unsupported auth alg */
+	uint32_t	is_rx_auth_fail;	/* rx sta auth failure */
+	uint32_t	is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */
+	uint32_t	is_rx_assoc_bss;	/* rx assoc from wrong bssid */
+	uint32_t	is_rx_assoc_notauth;	/* rx assoc w/o auth */
+	uint32_t	is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
+	uint32_t	is_rx_assoc_norate;	/* rx assoc w/ no rate match */
+	uint32_t	is_rx_assoc_badwpaie;	/* rx assoc w/ bad WPA IE */
+	uint32_t	is_rx_deauth;		/* rx deauthentication */
+	uint32_t	is_rx_disassoc;		/* rx disassociation */
+	uint32_t	is_rx_badsubtype;	/* rx frame w/ unknown subtype*/
+	uint32_t	is_rx_nobuf;		/* rx failed for lack of buf */
+	uint32_t	is_rx_decryptcrc;	/* rx decrypt failed on crc */
+	uint32_t	is_rx_ahdemo_mgt;	/* rx discard ahdemo mgt frame*/
+	uint32_t	is_rx_bad_auth;		/* rx bad auth request */
+	uint32_t	is_rx_unauth;		/* rx on unauthorized port */
+	uint32_t	is_rx_badkeyid;		/* rx w/ incorrect keyid */
+	uint32_t	is_rx_ccmpreplay;	/* rx seq# violation (CCMP) */
+	uint32_t	is_rx_ccmpformat;	/* rx format bad (CCMP) */
+	uint32_t	is_rx_ccmpmic;		/* rx MIC check failed (CCMP) */
+	uint32_t	is_rx_tkipreplay;	/* rx seq# violation (TKIP) */
+	uint32_t	is_rx_tkipformat;	/* rx format bad (TKIP) */
+	uint32_t	is_rx_tkipmic;		/* rx MIC check failed (TKIP) */
+	uint32_t	is_rx_tkipicv;		/* rx ICV check failed (TKIP) */
+	uint32_t	is_rx_badcipher;	/* rx failed 'cuz key type */
+	uint32_t	is_rx_nocipherctx;	/* rx failed 'cuz key !setup */
+	uint32_t	is_rx_acl;		/* rx discard 'cuz acl policy */
+	uint32_t	is_tx_nobuf;		/* tx failed for lack of buf */
+	uint32_t	is_tx_nonode;		/* tx failed for no node */
+	uint32_t	is_tx_unknownmgt;	/* tx of unknown mgt frame */
+	uint32_t	is_tx_badcipher;	/* tx failed 'cuz key type */
+	uint32_t	is_tx_nodefkey;		/* tx failed 'cuz no defkey */
+	uint32_t	is_tx_noheadroom;	/* tx failed 'cuz no space */
+	uint32_t	is_tx_fragframes;	/* tx frames fragmented */
+	uint32_t	is_tx_frags;		/* tx fragments created */
+	uint32_t	is_scan_active;		/* active scans started */
+	uint32_t	is_scan_passive;	/* passive scans started */
+	uint32_t	is_node_timeout;	/* nodes timed out inactivity */
+	uint32_t	is_crypto_nomem;	/* no memory for crypto ctx */
+	uint32_t	is_crypto_tkip;		/* tkip crypto done in s/w */
+	uint32_t	is_crypto_tkipenmic;	/* tkip en-MIC done in s/w */
+	uint32_t	is_crypto_tkipdemic;	/* tkip de-MIC done in s/w */
+	uint32_t	is_crypto_tkipcm;	/* tkip counter measures */
+	uint32_t	is_crypto_ccmp;		/* ccmp crypto done in s/w */
+	uint32_t	is_crypto_wep;		/* wep crypto done in s/w */
+	uint32_t	is_crypto_setkey_cipher;/* cipher rejected key */
+	uint32_t	is_crypto_setkey_nokey;	/* no key index for setkey */
+	uint32_t	is_crypto_delkey;	/* driver key delete failed */
+	uint32_t	is_crypto_badcipher;	/* unknown cipher */
+	uint32_t	is_crypto_nocipher;	/* cipher not available */
+	uint32_t	is_crypto_attachfail;	/* cipher attach failed */
+	uint32_t	is_crypto_swfallback;	/* cipher fallback to s/w */
+	uint32_t	is_crypto_keyfail;	/* driver key alloc failed */
+	uint32_t	is_crypto_enmicfail;	/* en-MIC failed */
+	uint32_t	is_ibss_capmismatch;	/* merge failed-cap mismatch */
+	uint32_t	is_ibss_norate;		/* merge failed-rate mismatch */
+	uint32_t	is_ps_unassoc;		/* ps-poll for unassoc. sta */
+	uint32_t	is_ps_badaid;		/* ps-poll w/ incorrect aid */
+	uint32_t	is_ps_qempty;		/* ps-poll w/ nothing to send */
+	uint32_t	is_ff_badhdr;		/* fast frame rx'd w/ bad hdr */
+	uint32_t	is_ff_tooshort;		/* fast frame rx decap error */
+	uint32_t	is_ff_split;		/* fast frame rx split error */
+	uint32_t	is_ff_decap;		/* fast frames decap'd */
+	uint32_t	is_ff_encap;		/* fast frames encap'd for tx */
+	uint32_t	is_rx_badbintval;	/* rx frame w/ bogus bintval */
+	uint32_t	is_rx_demicfail;	/* rx demic failed */
+	uint32_t	is_rx_defrag;		/* rx defragmentation failed */
+	uint32_t	is_rx_mgmt;		/* rx management frames */
+	uint32_t	is_rx_action;		/* rx action mgt frames */
+	uint32_t	is_amsdu_tooshort;	/* A-MSDU rx decap error */
+	uint32_t	is_amsdu_split;		/* A-MSDU rx split error */
+	uint32_t	is_amsdu_decap;		/* A-MSDU decap'd */
+	uint32_t	is_amsdu_encap;		/* A-MSDU encap'd for tx */
+	uint32_t	is_ampdu_bar_bad;	/* A-MPDU BAR out of window */
+	uint32_t	is_ampdu_bar_oow;	/* A-MPDU BAR before ADDBA */
+	uint32_t	is_ampdu_bar_rx;	/* A-MPDU BAR frames handled */
+	uint32_t	is_ampdu_rx_flush;	/* A-MPDU frames flushed */
+	uint32_t	is_ampdu_rx_oor;	/* A-MPDU frames out-of-order */
+	uint32_t	is_ampdu_rx_copy;	/* A-MPDU frames copied down */
+	uint32_t	is_spare[32];
 };
 
 /*
@@ -199,17 +211,17 @@ struct ieee80211_stats {
  more than IEEE80211_KEYBUF_SIZE.
  */
 struct ieee80211req_key {
-	u_int8_t	ik_type;	/* key/cipher type */
-	u_int8_t	ik_pad;
-	u_int16_t	ik_keyix;	/* key index */
-	u_int8_t	ik_keylen;	/* key length in bytes */
-	u_int8_t	ik_flags;
+	uint8_t		ik_type;	/* key/cipher type */
+	uint8_t		ik_pad;
+	uint16_t	ik_keyix;	/* key index */
+	uint8_t		ik_keylen;	/* key length in bytes */
+	uint8_t		ik_flags;
 /* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */
 #define	IEEE80211_KEY_DEFAULT	0x80	/* default xmit key */
-	u_int8_t	ik_macaddr[IEEE80211_ADDR_LEN];
-	u_int64_t	ik_keyrsc;	/* key receive sequence counter */
-	u_int64_t	ik_keytsc;	/* key transmit sequence counter */
-	u_int8_t	ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
+	uint8_t		ik_macaddr[IEEE80211_ADDR_LEN];
+	uint64_t	ik_keyrsc;	/* key receive sequence counter */
+	uint64_t	ik_keytsc;	/* key transmit sequence counter */
+	uint8_t		ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
 };
 
 /*
@@ -217,8 +229,8 @@ struct ieee80211req_key {
  * to IEEE80211_KEYIX_NONE when deleting a unicast key.
  */
 struct ieee80211req_del_key {
-	u_int8_t	idk_keyix;	/* key index */
-	u_int8_t	idk_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		idk_keyix;	/* key index */
+	uint8_t		idk_macaddr[IEEE80211_ADDR_LEN];
 };
 
 /*
@@ -228,16 +240,16 @@ struct ieee80211req_del_key {
  * ap (to effect a station).
  */
 struct ieee80211req_mlme {
-	u_int8_t	im_op;		/* operation to perform */
+	uint8_t		im_op;		/* operation to perform */
 #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 */
-	u_int8_t	im_ssid_len;	/* length of optional ssid */
-	u_int16_t	im_reason;	/* 802.11 reason code */
-	u_int8_t	im_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	im_ssid[IEEE80211_NWID_LEN];
+	uint8_t		im_ssid_len;	/* length of optional ssid */
+	uint16_t	im_reason;	/* 802.11 reason code */
+	uint8_t		im_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		im_ssid[IEEE80211_NWID_LEN];
 };
 
 /* 
@@ -254,7 +266,7 @@ enum {
 };
 
 struct ieee80211req_maclist {
-	u_int8_t	ml_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		ml_macaddr[IEEE80211_ADDR_LEN];
 };
 
 /*
@@ -264,7 +276,7 @@ struct ieee80211req_maclist {
  * scanning.
  */
 struct ieee80211req_chanlist {
-	u_int8_t	ic_channels[IEEE80211_CHAN_BYTES];
+	uint8_t		ic_channels[IEEE80211_CHAN_BYTES];
 };
 
 /*
@@ -278,9 +290,14 @@ struct ieee80211req_chaninfo {
 /*
  * Retrieve the WPA/RSN information element for an associated station.
  */
-struct ieee80211req_wpaie {
-	u_int8_t	wpa_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	wpa_ie[IEEE80211_MAX_OPT_IE];
+struct ieee80211req_wpaie {	/* old version w/ only one ie */
+	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
+};
+struct ieee80211req_wpaie2 {
+	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
+	uint8_t		rsn_ie[IEEE80211_MAX_OPT_IE];
 };
 
 /*
@@ -289,8 +306,8 @@ struct ieee80211req_wpaie {
 struct ieee80211req_sta_stats {
 	union {
 		/* NB: explicitly force 64-bit alignment */
-		u_int8_t	macaddr[IEEE80211_ADDR_LEN];
-		u_int64_t	pad;
+		uint8_t		macaddr[IEEE80211_ADDR_LEN];
+		uint64_t	pad;
 	} is_u;
 	struct ieee80211_nodestats is_stats;
 };
@@ -300,27 +317,28 @@ struct ieee80211req_sta_stats {
  * to retrieve other data like stats, unicast key, etc.
  */
 struct ieee80211req_sta_info {
-	u_int16_t	isi_len;		/* length (mult of 4) */
-	u_int16_t	isi_freq;		/* MHz */
-	u_int16_t	isi_flags;		/* channel flags */
-	u_int16_t	isi_state;		/* state flags */
-	u_int8_t	isi_authmode;		/* authentication algorithm */
+	uint16_t	isi_len;		/* length (mult of 4) */
+	uint16_t	isi_ie_off;		/* offset to IE data */
+	uint16_t	isi_ie_len;		/* IE length */
+	uint16_t	isi_freq;		/* MHz */
+	uint16_t	isi_flags;		/* channel flags */
+	uint16_t	isi_state;		/* state flags */
+	uint8_t		isi_authmode;		/* authentication algorithm */
 	int8_t		isi_rssi;		/* receive signal strength */
-	u_int8_t	isi_capinfo;		/* capabilities */
-	u_int8_t	isi_erp;		/* ERP element */
-	u_int8_t	isi_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	isi_nrates;
-						/* negotiated rates */
-	u_int8_t	isi_rates[IEEE80211_RATE_MAXSIZE];
-	u_int8_t	isi_txrate;		/* index to isi_rates[] */
 	int8_t		isi_noise;		/* noise floor */
-	u_int16_t	isi_ie_len;		/* IE length */
-	u_int16_t	isi_associd;		/* assoc response */
-	u_int16_t	isi_txpower;		/* current tx power */
-	u_int16_t	isi_vlan;		/* vlan tag */
-	u_int16_t	isi_txseqs[17];		/* seq to be transmitted */
-	u_int16_t	isi_rxseqs[17];		/* seq previous for qos frames*/
-	u_int16_t	isi_inact;		/* inactivity timer */
+	uint8_t		isi_capinfo;		/* capabilities */
+	uint8_t		isi_erp;		/* ERP element */
+	uint8_t		isi_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		isi_nrates;
+						/* negotiated rates */
+	uint8_t		isi_rates[IEEE80211_RATE_MAXSIZE];
+	uint8_t		isi_txrate;		/* index to isi_rates[] */
+	uint16_t	isi_associd;		/* assoc response */
+	uint16_t	isi_txpower;		/* current tx power */
+	uint16_t	isi_vlan;		/* vlan tag */
+	uint16_t	isi_txseqs[17];		/* seq to be transmitted */
+	uint16_t	isi_rxseqs[17];		/* seq previous for qos frames*/
+	uint16_t	isi_inact;		/* inactivity timer */
 	/* XXX frag state? */
 	/* variable length IE data */
 };
@@ -332,8 +350,8 @@ struct ieee80211req_sta_info {
 struct ieee80211req_sta_req {
 	union {
 		/* NB: explicitly force 64-bit alignment */
-		u_int8_t	macaddr[IEEE80211_ADDR_LEN];
-		u_int64_t	pad;
+		uint8_t		macaddr[IEEE80211_ADDR_LEN];
+		uint64_t	pad;
 	} is_u;
 	struct ieee80211req_sta_info info[1];	/* variable length */
 };
@@ -342,8 +360,8 @@ struct ieee80211req_sta_req {
  * Get/set per-station tx power cap.
  */
 struct ieee80211req_sta_txpow {
-	u_int8_t	it_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	it_txpow;
+	uint8_t		it_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		it_txpow;
 };
 
 /*
@@ -363,13 +381,14 @@ struct ieee80211req_sta_txpow {
 /* the first member must be matched with struct ifreq */
 struct ieee80211req {
 	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
-	u_int16_t	i_type;			/* req type */
+	uint16_t	i_type;			/* req type */
 	int16_t		i_val;			/* Index or simple value */
 	int16_t		i_len;			/* Index or simple value */
 	void		*i_data;		/* Extra data */
 };
 #define	SIOCS80211		 _IOW('i', 234, struct ieee80211req)
 #define	SIOCG80211		_IOWR('i', 235, struct ieee80211req)
+#define	SIOCG80211STATS		_IOWR('i', 236, struct ifreq)
 
 #define IEEE80211_IOC_SSID		1
 #define IEEE80211_IOC_NUMSSIDS		2
@@ -440,12 +459,38 @@ struct ieee80211req {
 #define	IEEE80211_IOC_ADDMAC		54	/* add sta to MAC ACL table */
 #define	IEEE80211_IOC_DELMAC		55	/* del sta from MAC ACL table */
 #define	IEEE80211_IOC_PUREG		56	/* pure 11g (no 11b stations) */
+#define	IEEE80211_IOC_FF		57	/* ATH fast frames (on, off) */
+#define	IEEE80211_IOC_TURBOP		58	/* ATH turbo' (on, off) */
+#define	IEEE80211_IOC_BGSCAN		59	/* bg scanning (on, off) */
+#define	IEEE80211_IOC_BGSCAN_IDLE	60	/* bg scan idle threshold */
+#define	IEEE80211_IOC_BGSCAN_INTERVAL	61	/* bg scan interval */
+#define	IEEE80211_IOC_SCANVALID		65	/* scan cache valid threshold */
+#define	IEEE80211_IOC_ROAM_RSSI_11A	66	/* rssi threshold in 11a */
+#define	IEEE80211_IOC_ROAM_RSSI_11B	67	/* rssi threshold in 11b */
+#define	IEEE80211_IOC_ROAM_RSSI_11G	68	/* rssi threshold in 11g */
+#define	IEEE80211_IOC_ROAM_RATE_11A	69	/* tx rate threshold in 11a */
+#define	IEEE80211_IOC_ROAM_RATE_11B	70	/* tx rate threshold in 11b */
+#define	IEEE80211_IOC_ROAM_RATE_11G	71	/* tx rate threshold in 11g */
 #define	IEEE80211_IOC_MCAST_RATE	72	/* tx rate for mcast frames */
 #define	IEEE80211_IOC_FRAGTHRESHOLD	73	/* tx fragmentation threshold */
 #define	IEEE80211_IOC_BURST		75	/* packet bursting */
 #define	IEEE80211_IOC_SCAN_RESULTS	76	/* get scan results */
 #define	IEEE80211_IOC_BMISSTHRESHOLD	77	/* beacon miss threshold */
 #define	IEEE80211_IOC_STA_INFO		78	/* station/neighbor info */
+#define	IEEE80211_IOC_WPAIE2		79	/* WPA+RSN info elements */
+#define	IEEE80211_IOC_CURCHAN		80	/* current channel */
+#define	IEEE80211_IOC_SHORTGI		81	/* 802.11n half GI */
+#define	IEEE80211_IOC_AMPDU		82	/* 802.11n A-MPDU (on, off) */
+#define	IEEE80211_IOC_AMPDU_LIMIT	83	/* A-MPDU length limit */
+#define	IEEE80211_IOC_AMPDU_DENSITY	84	/* A-MPDU density */
+#define	IEEE80211_IOC_AMSDU		85	/* 802.11n A-MSDU (on, off) */
+#define	IEEE80211_IOC_AMSDU_LIMIT	86	/* A-MSDU length limit */
+#define	IEEE80211_IOC_PUREN		87	/* pure 11n (no legacy sta's) */
+#define	IEEE80211_IOC_DOTH		88	/* 802.11h (on, off) */
+#define	IEEE80211_IOC_REGDOMAIN		89	/* regulatory domain */
+#define	IEEE80211_IOC_COUNTRYCODE	90	/* ISO country code */
+#define	IEEE80211_IOC_LOCATION		91	/* indoor/outdoor/anywhere */
+#define	IEEE80211_IOC_HTCOMPAT		92	/* support pre-D1.10 HT ie's */
 
 /*
  * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
@@ -456,24 +501,27 @@ struct ieee80211req {
  * in isr_len.  Result records are rounded to a multiple of 4 bytes.
  */
 struct ieee80211req_scan_result {
-	u_int16_t	isr_len;		/* length (mult of 4) */
-	u_int16_t	isr_ie_len;		/* IE length */
-	u_int16_t	isr_freq;		/* MHz */
-	u_int16_t	isr_flags;		/* channel flags */
+	uint16_t	isr_len;		/* length (mult of 4) */
+	uint16_t	isr_ie_off;		/* offset to IE data */
+	uint16_t	isr_ie_len;		/* IE length */
+	uint16_t	isr_freq;		/* MHz */
+	uint16_t	isr_flags;		/* channel flags */
 	int8_t		isr_noise;
 	int8_t		isr_rssi;
-	u_int8_t	isr_intval;		/* beacon interval */
-	u_int8_t	isr_capinfo;		/* capabilities */
-	u_int8_t	isr_erp;		/* ERP element */
-	u_int8_t	isr_bssid[IEEE80211_ADDR_LEN];
-	u_int8_t	isr_nrates;
-	u_int8_t	isr_rates[IEEE80211_RATE_MAXSIZE];
-	u_int8_t	isr_ssid_len;		/* SSID length */
-	u_int8_t	isr_pad[8];
+	uint8_t		isr_intval;		/* beacon interval */
+	uint8_t		isr_capinfo;		/* capabilities */
+	uint8_t		isr_erp;		/* ERP element */
+	uint8_t		isr_bssid[IEEE80211_ADDR_LEN];
+	uint8_t		isr_nrates;
+	uint8_t		isr_rates[IEEE80211_RATE_MAXSIZE];
+	uint8_t		isr_ssid_len;		/* SSID length */
 	/* variable length SSID followed by IE data */
 };
 
-#define	SIOCG80211STATS		_IOWR('i', 236, struct ifreq)
+struct ieee80211_clone_params {
+	char	icp_parent[IFNAMSIZ];		/* parent device */
+	int	icp_opmode;			/* operating mode */
+};
 #endif /* __FreeBSD__ */
 
 #endif /* _NET80211_IEEE80211_IOCTL_H_ */