PERFORCE change 119750 for review

Sepherosa Ziehau sephe at FreeBSD.org
Sun May 13 04:44:08 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=119750

Change 119750 by sephe at sephe_zealot:sam_wifi on 2007/05/13 04:43:30

	u_intX_t -> uintX_t
	
	Approved by:	sam

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#78 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#39 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#78 (text+ko) ====

@@ -220,7 +220,7 @@
 ieee80211_ioctl_getstastats(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
-	u_int8_t macaddr[IEEE80211_ADDR_LEN];
+	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	const int off = __offsetof(struct ieee80211req_sta_stats, is_stats);
 	int error;
 
@@ -235,14 +235,14 @@
 	if (ireq->i_len > sizeof(struct ieee80211req_sta_stats))
 		ireq->i_len = sizeof(struct ieee80211req_sta_stats);
 	/* NB: copy out only the statistics */
-	error = copyout(&ni->ni_stats, (u_int8_t *) ireq->i_data + off,
+	error = copyout(&ni->ni_stats, (uint8_t *) ireq->i_data + off,
 			ireq->i_len - off);
 	ieee80211_free_node(ni);
 	return error;
 }
 
-static __inline u_int8_t *
-copyie(u_int8_t *cp, const u_int8_t *ie)
+static __inline uint8_t *
+copyie(uint8_t *cp, const uint8_t *ie)
 {
 	if (ie != NULL) {
 		memcpy(cp, ie, 2+ie[1]);
@@ -255,20 +255,20 @@
 #define	IEEE80211_IOC_SCAN_RESULTS_OLD	24
 
 struct scan_result_old {
-	u_int16_t	isr_len;		/* length (mult of 4) */
-	u_int16_t	isr_freq;		/* MHz */
-	u_int16_t	isr_flags;		/* channel flags */
-	u_int8_t	isr_noise;
-	u_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_ie_len;		/* IE length */
-	u_int8_t	isr_pad[5];
+	uint16_t	isr_len;		/* length (mult of 4) */
+	uint16_t	isr_freq;		/* MHz */
+	uint16_t	isr_flags;		/* channel flags */
+	uint8_t		isr_noise;
+	uint8_t		isr_rssi;
+	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 */
+	uint8_t		isr_ie_len;		/* IE length */
+	uint8_t		isr_pad[5];
 	/* variable length SSID followed by IE data */
 };
 
@@ -293,7 +293,7 @@
 	 * 16-bits; if this is a concern we can drop the ie's.
 	 */
 	len = sizeof(struct scan_result_old) + se->se_ssid[1] + *ielen;
-	return roundup(len, sizeof(u_int32_t));
+	return roundup(len, sizeof(uint32_t));
 }
 
 static void
@@ -311,7 +311,7 @@
 	struct oscanreq *req = arg;
 	struct scan_result_old *sr;
 	int ielen, len, nr, nxr;
-	u_int8_t *cp;
+	uint8_t *cp;
 
 	len = old_scan_space(se, &ielen);
 	if (len > req->space)
@@ -337,7 +337,7 @@
 	memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr);
 	sr->isr_nrates = nr + nxr;
 
-	cp = (u_int8_t *)(sr+1);
+	cp = (uint8_t *)(sr+1);
 	memcpy(cp, se->se_ssid+2, sr->isr_ssid_len);
 	cp += sr->isr_ssid_len;
 	if (sr->isr_ie_len) {
@@ -346,7 +346,7 @@
 	}
 
 	req->space -= len;
-	req->sr = (struct scan_result_old *)(((u_int8_t *)sr) + len);
+	req->sr = (struct scan_result_old *)(((uint8_t *)sr) + len);
 }
 
 static int
@@ -409,7 +409,7 @@
 	 * 16-bits; if this is a concern we can drop the ie's.
 	 */
 	len = sizeof(struct ieee80211req_scan_result) + se->se_ssid[1] + *ielen;
-	return roundup(len, sizeof(u_int32_t));
+	return roundup(len, sizeof(uint32_t));
 }
 
 static void
@@ -427,7 +427,7 @@
 	struct scanreq *req = arg;
 	struct ieee80211req_scan_result *sr;
 	int ielen, len, nr, nxr;
-	u_int8_t *cp;
+	uint8_t *cp;
 
 	len = scan_space(se, &ielen);
 	if (len > req->space)
@@ -453,7 +453,7 @@
 	memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr);
 	sr->isr_nrates = nr + nxr;
 
-	cp = (u_int8_t *)(sr+1);
+	cp = (uint8_t *)(sr+1);
 	memcpy(cp, se->se_ssid+2, sr->isr_ssid_len);
 	cp += sr->isr_ssid_len;
 	if (sr->isr_ie_len) {
@@ -465,7 +465,7 @@
 	}
 
 	req->space -= len;
-	req->sr = (struct ieee80211req_scan_result *)(((u_int8_t *)sr) + len);
+	req->sr = (struct ieee80211req_scan_result *)(((uint8_t *)sr) + len);
 }
 
 static int
@@ -521,7 +521,7 @@
 	if (ni->ni_ath_ie != NULL)
 		*ielen += 2+ni->ni_ath_ie[1];
 	return roundup(sizeof(struct ieee80211req_sta_info) + *ielen,
-		      sizeof(u_int32_t));
+		      sizeof(uint32_t));
 }
 
 static void
@@ -544,7 +544,7 @@
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211req_sta_info *si;
 	size_t ielen, len;
-	u_int8_t *cp;
+	uint8_t *cp;
 
 	if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
 	    ni->ni_associd == 0)	/* only associated stations */
@@ -591,13 +591,13 @@
 		si->isi_inact = ic->ic_inact_init;
 	si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT;
 
-	cp = (u_int8_t *)(si+1);
+	cp = (uint8_t *)(si+1);
 	cp = copyie(cp, ni->ni_wpa_ie);
 	cp = copyie(cp, ni->ni_rsn_ie);
 	cp = copyie(cp, ni->ni_wme_ie);
 	cp = copyie(cp, ni->ni_ath_ie);
 
-	req->si = (struct ieee80211req_sta_info *)(((u_int8_t *)si) + len);
+	req->si = (struct ieee80211req_sta_info *)(((uint8_t *)si) + len);
 	req->space -= len;
 }
 
@@ -632,7 +632,7 @@
 		else
 			get_sta_info(&req, ni);
 		ireq->i_len = space - req.space;
-		error = copyout(p, (u_int8_t *) ireq->i_data+off, ireq->i_len);
+		error = copyout(p, (uint8_t *) ireq->i_data+off, ireq->i_len);
 		FREE(p, M_TEMP);
 	} else
 		ireq->i_len = 0;
@@ -645,7 +645,7 @@
 static int
 ieee80211_ioctl_getstainfo(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
-	u_int8_t macaddr[IEEE80211_ADDR_LEN];
+	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	const int off = __offsetof(struct ieee80211req_sta_req, info);
 	struct ieee80211_node *ni;
 	int error;
@@ -795,7 +795,7 @@
 	const struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn;
 	int error = 0;
 	u_int kid, len, m;
-	u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE];
+	uint8_t tmpkey[IEEE80211_KEYBUF_SIZE];
 	char tmpssid[IEEE80211_NWID_LEN];
 
 	switch (ireq->i_type) {
@@ -1159,7 +1159,7 @@
 	struct ieee80211req_key ik;
 	struct ieee80211_node *ni;
 	struct ieee80211_key *wk;
-	u_int16_t kid;
+	uint16_t kid;
 	int error;
 
 	if (ireq->i_len != sizeof(ik))
@@ -1236,8 +1236,8 @@
 	if (error)
 		return error;
 	kid = dk.idk_keyix;
-	/* XXX u_int8_t -> u_int16_t */
-	if (dk.idk_keyix == (u_int8_t) IEEE80211_KEYIX_NONE) {
+	/* XXX uint8_t -> uint16_t */
+	if (dk.idk_keyix == (uint8_t) IEEE80211_KEYIX_NONE) {
 		struct ieee80211_node *ni;
 
 		if (ic->ic_opmode == IEEE80211_M_STA) {
@@ -1280,9 +1280,9 @@
 }
 
 struct scanlookup {
-	const u_int8_t *mac;
+	const uint8_t *mac;
 	int esslen;
-	const u_int8_t *essid;
+	const uint8_t *essid;
 	const struct ieee80211_scan_entry *se;
 };
 
@@ -1381,7 +1381,7 @@
 static int
 ieee80211_ioctl_macmac(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
-	u_int8_t mac[IEEE80211_ADDR_LEN];
+	uint8_t mac[IEEE80211_ADDR_LEN];
 	const struct ieee80211_aclator *acl = ic->ic_acl;
 	int error;
 
@@ -1485,7 +1485,7 @@
 ieee80211_ioctl_setstastats(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
 	struct ieee80211_node *ni;
-	u_int8_t macaddr[IEEE80211_ADDR_LEN];
+	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	int error;
 
 	/*
@@ -1875,13 +1875,13 @@
 static int
 ieee80211_ioctl_set80211(struct ieee80211com *ic, u_long cmd, struct ieee80211req *ireq)
 {
-	static const u_int8_t zerobssid[IEEE80211_ADDR_LEN];
+	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 	struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn;
 	int error;
 	const struct ieee80211_authenticator *auth;
-	u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE];
+	uint8_t tmpkey[IEEE80211_KEYBUF_SIZE];
 	char tmpssid[IEEE80211_NWID_LEN];
-	u_int8_t tmpbssid[IEEE80211_ADDR_LEN];
+	uint8_t tmpbssid[IEEE80211_ADDR_LEN];
 	struct ieee80211_key *k;
 	int j, caps;
 	u_int kid;
@@ -1951,7 +1951,7 @@
 	case IEEE80211_IOC_WEPTXKEY:
 		kid = (u_int) ireq->i_val;
 		if (kid >= IEEE80211_WEP_NKID &&
-		    (u_int16_t) kid != IEEE80211_KEYIX_NONE)
+		    (uint16_t) kid != IEEE80211_KEYIX_NONE)
 			return EINVAL;
 		ic->ic_def_txkey = kid;
 		break;
@@ -2187,8 +2187,8 @@
 		break;
 	case IEEE80211_IOC_DRIVER_CAPS:
 		/* NB: for testing */
-		ic->ic_caps = (((u_int16_t) ireq->i_val) << 16) |
-			       ((u_int16_t) ireq->i_len);
+		ic->ic_caps = (((uint16_t) ireq->i_val) << 16) |
+			       ((uint16_t) ireq->i_len);
 		break;
 	case IEEE80211_IOC_KEYMGTALGS:
 		/* XXX check */

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#39 (text+ko) ====

@@ -45,158 +45,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_action;		/* rx action */
-	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_rx_action;		/* rx action mgt frames */
-	u_int32_t	is_amsdu_tooshort;	/* A-MSDU rx decap error */
-	u_int32_t	is_amsdu_split;		/* A-MSDU rx split error */
-	u_int32_t	is_amsdu_decap;		/* A-MSDU decap'd */
-	u_int32_t	is_amsdu_encap;		/* A-MSDU encap'd for tx */
-	u_int32_t	is_ampdu_bar_bad;	/* A-MPDU BAR out of window */
-	u_int32_t	is_ampdu_bar_oow;	/* A-MPDU BAR before ADDBA */
-	u_int32_t	is_ampdu_bar_rx;	/* A-MPDU BAR frames handled */
-	u_int32_t	is_ampdu_rx_flush;	/* A-MPDU frames flushed */
-	u_int32_t	is_ampdu_rx_oor;	/* A-MPDU frames out-of-order */
-	u_int32_t	is_ampdu_rx_copy;	/* A-MPDU frames copied down */
-	u_int32_t	is_spare[32];
+	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];
 };
 
 /*
@@ -217,17 +217,17 @@
  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];
 };
 
 /*
@@ -235,8 +235,8 @@
  * 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];
 };
 
 /*
@@ -246,16 +246,16 @@
  * 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];
 };
 
 /* 
@@ -272,7 +272,7 @@
 };
 
 struct ieee80211req_maclist {
-	u_int8_t	ml_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		ml_macaddr[IEEE80211_ADDR_LEN];
 };
 
 /*
@@ -282,7 +282,7 @@
  * scanning.
  */
 struct ieee80211req_chanlist {
-	u_int8_t	ic_channels[IEEE80211_CHAN_BYTES];
+	uint8_t		ic_channels[IEEE80211_CHAN_BYTES];
 };
 
 /*
@@ -297,13 +297,13 @@
  * Retrieve the WPA/RSN information element for an associated station.
  */
 struct ieee80211req_wpaie {	/* old version w/ only one ie */
-	u_int8_t	wpa_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	wpa_ie[IEEE80211_MAX_OPT_IE];
+	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
 };
 struct ieee80211req_wpaie2 {
-	u_int8_t	wpa_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t	wpa_ie[IEEE80211_MAX_OPT_IE];
-	u_int8_t	rsn_ie[IEEE80211_MAX_OPT_IE];
+	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
+	uint8_t		rsn_ie[IEEE80211_MAX_OPT_IE];
 };
 
 /*
@@ -312,8 +312,8 @@
 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;
 };
@@ -323,27 +323,27 @@
  * 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_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 */
 	int8_t		isi_noise;		/* noise floor */
-	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;
+	uint8_t		isi_capinfo;		/* capabilities */
+	uint8_t		isi_erp;		/* ERP element */
+	uint8_t		isi_macaddr[IEEE80211_ADDR_LEN];
+	uint8_t		isi_nrates;
 						/* negotiated rates */
-	u_int8_t	isi_rates[IEEE80211_RATE_MAXSIZE];
-	u_int8_t	isi_txrate;		/* index to isi_rates[] */
-	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_rates[IEEE80211_RATE_MAXSIZE];
+	uint8_t		isi_txrate;		/* index to isi_rates[] */
+	uint16_t	isi_ie_len;		/* IE length */
+	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 */
 };
@@ -355,8 +355,8 @@
 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 */
 };
@@ -365,8 +365,8 @@
  * 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;
 };
 
 /*
@@ -386,7 +386,7 @@
 /* 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 */
@@ -506,20 +506,20 @@
  * 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_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 */
+	uint8_t		isr_pad[8];
 	/* variable length SSID followed by IE data */
 };
 


More information about the p4-projects mailing list