Deleted Added
full compact
26c26
< * $FreeBSD: head/sys/net80211/ieee80211_ioctl.h 170360 2007-06-06 04:56:04Z sam $
---
> * $FreeBSD: head/sys/net80211/ieee80211_ioctl.h 170530 2007-06-11 03:36:55Z sam $
42,49c42,49
< 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 */
51,61c51,62
< 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 */
63,68c64,69
< 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 */
70,71c71,72
< 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 */
73c74
< u_int32_t ns_ps_discard; /* ps discard 'cuz of age */
---
> uint32_t ns_ps_discard; /* ps discard 'cuz of age */
76,83c77,84
< 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 */
90,181c91,193
< 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];
202,206c214,218
< 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;
209,212c221,224
< 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];
220,221c232,233
< 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];
231c243
< u_int8_t im_op; /* operation to perform */
---
> uint8_t im_op; /* operation to perform */
237,240c249,252
< 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];
257c269
< u_int8_t ml_macaddr[IEEE80211_ADDR_LEN];
---
> uint8_t ml_macaddr[IEEE80211_ADDR_LEN];
267c279
< u_int8_t ic_channels[IEEE80211_CHAN_BYTES];
---
> uint8_t ic_channels[IEEE80211_CHAN_BYTES];
281,283c293,295
< 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];
284a297,301
> 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];
> };
292,293c309,310
< u_int8_t macaddr[IEEE80211_ADDR_LEN];
< u_int64_t pad;
---
> uint8_t macaddr[IEEE80211_ADDR_LEN];
> uint64_t pad;
303,307c320,326
< 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 */
309,315d327
< 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[] */
317,323c329,341
< 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 */
335,336c353,354
< u_int8_t macaddr[IEEE80211_ADDR_LEN];
< u_int64_t pad;
---
> uint8_t macaddr[IEEE80211_ADDR_LEN];
> uint64_t pad;
345,346c363,364
< u_int8_t it_macaddr[IEEE80211_ADDR_LEN];
< u_int8_t it_txpow;
---
> uint8_t it_macaddr[IEEE80211_ADDR_LEN];
> uint8_t it_txpow;
366c384
< u_int16_t i_type; /* req type */
---
> uint16_t i_type; /* req type */
372a391
> #define SIOCG80211STATS _IOWR('i', 236, struct ifreq)
442a462,473
> #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 */
448a480,493
> #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 */
459,462c504,508
< 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 */
465,472c511,517
< 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 */
476c521,524
< #define SIOCG80211STATS _IOWR('i', 236, struct ifreq)
---
> struct ieee80211_clone_params {
> char icp_parent[IFNAMSIZ]; /* parent device */
> int icp_opmode; /* operating mode */
> };