Date: Sun, 13 May 2007 04:56:20 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 119751 for review Message-ID: <200705130456.l4D4uK9J049140@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=119751 Change 119751 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:55:54 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#93 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#45 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#93 (text+ko) ==== @@ -74,7 +74,7 @@ static void node_getsignal(const struct ieee80211_node *, int8_t *, int8_t *); static void ieee80211_setup_node(struct ieee80211_node_table *, - struct ieee80211_node *, const u_int8_t *); + struct ieee80211_node *, const uint8_t *); static void _ieee80211_free_node(struct ieee80211_node *); static void ieee80211_node_table_init(struct ieee80211com *ic, @@ -114,8 +114,8 @@ if (ic->ic_max_aid > IEEE80211_AID_MAX) ic->ic_max_aid = IEEE80211_AID_MAX; - MALLOC(ic->ic_aid_bitmap, u_int32_t *, - howmany(ic->ic_max_aid, 32) * sizeof(u_int32_t), + MALLOC(ic->ic_aid_bitmap, uint32_t *, + howmany(ic->ic_max_aid, 32) * sizeof(uint32_t), M_80211_NODE, M_NOWAIT | M_ZERO); if (ic->ic_aid_bitmap == NULL) { /* XXX no way to recover */ @@ -398,7 +398,7 @@ static int check_bss(struct ieee80211com *ic, struct ieee80211_node *ni) { - u_int8_t rate; + uint8_t rate; if (isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, ni->ni_chan))) return 0; @@ -437,7 +437,7 @@ static void check_bss_debug(struct ieee80211com *ic, struct ieee80211_node *ni) { - u_int8_t rate; + uint8_t rate; int fail; fail = 0; @@ -787,7 +787,7 @@ static void ieee80211_setup_node(struct ieee80211_node_table *nt, - struct ieee80211_node *ni, const u_int8_t *macaddr) + struct ieee80211_node *ni, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; int hash; @@ -817,7 +817,7 @@ } struct ieee80211_node * -ieee80211_alloc_node(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_alloc_node(struct ieee80211_node_table *nt, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -837,7 +837,7 @@ * once the send completes. */ struct ieee80211_node * -ieee80211_tmp_node(struct ieee80211com *ic, const u_int8_t *macaddr) +ieee80211_tmp_node(struct ieee80211com *ic, const uint8_t *macaddr) { struct ieee80211_node *ni; @@ -867,7 +867,7 @@ } struct ieee80211_node * -ieee80211_dup_bss(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_dup_bss(struct ieee80211_node_table *nt, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -892,10 +892,10 @@ static struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT _ieee80211_find_node_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, const char *func, int line) + const uint8_t *macaddr, const char *func, int line) #else _ieee80211_find_node(struct ieee80211_node_table *nt, - const u_int8_t *macaddr) + const uint8_t *macaddr) #endif { struct ieee80211_node *ni; @@ -927,9 +927,9 @@ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT ieee80211_find_node_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, const char *func, int line) + const uint8_t *macaddr, const char *func, int line) #else -ieee80211_find_node(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_find_node(struct ieee80211_node_table *nt, const uint8_t *macaddr) #endif { struct ieee80211_node *ni; @@ -948,7 +948,7 @@ */ struct ieee80211_node * ieee80211_fakeup_adhoc_node(struct ieee80211_node_table *nt, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]) + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -1145,10 +1145,10 @@ */ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT -ieee80211_find_txnode_debug(struct ieee80211com *ic, const u_int8_t *macaddr, +ieee80211_find_txnode_debug(struct ieee80211com *ic, const uint8_t *macaddr, const char *func, int line) #else -ieee80211_find_txnode(struct ieee80211com *ic, const u_int8_t *macaddr) +ieee80211_find_txnode(struct ieee80211com *ic, const uint8_t *macaddr) #endif { struct ieee80211_node_table *nt = &ic->ic_sta; @@ -1206,16 +1206,16 @@ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT ieee80211_find_node_with_ssid_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, u_int ssidlen, const u_int8_t *ssid, + const uint8_t *macaddr, u_int ssidlen, const uint8_t *ssid, const char *func, int line) #else ieee80211_find_node_with_ssid(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, u_int ssidlen, const u_int8_t *ssid) + const uint8_t *macaddr, u_int ssidlen, const uint8_t *ssid) #endif { #define MATCH_SSID(ni, ssid, ssidlen) \ (ni->ni_esslen == ssidlen && memcmp(ni->ni_essid, ssid, ssidlen) == 0) - static const u_int8_t zeromac[IEEE80211_ADDR_LEN]; + static const uint8_t zeromac[IEEE80211_ADDR_LEN]; struct ieee80211_node *ni; int hash; @@ -1702,7 +1702,7 @@ int newassoc; if (ni->ni_associd == 0) { - u_int16_t aid; + uint16_t aid; /* * It would be good to search the bitmap ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#45 (text+ko) ==== @@ -64,18 +64,18 @@ #define IEEE80211_NODE_HASHSIZE 32 /* simple hash is enough for variation of macaddr */ #define IEEE80211_NODE_HASH(addr) \ - (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \ + (((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \ IEEE80211_NODE_HASHSIZE) struct ieee80211_rsnparms { - u_int8_t rsn_mcastcipher; /* mcast/group cipher */ - u_int8_t rsn_mcastkeylen; /* mcast key length */ - u_int8_t rsn_ucastcipherset; /* unicast cipher set */ - u_int8_t rsn_ucastcipher; /* selected unicast cipher */ - u_int8_t rsn_ucastkeylen; /* unicast key length */ - u_int8_t rsn_keymgmtset; /* key mangement algorithms */ - u_int8_t rsn_keymgmt; /* selected key mgmt algo */ - u_int16_t rsn_caps; /* capabilities */ + uint8_t rsn_mcastcipher; /* mcast/group cipher */ + uint8_t rsn_mcastkeylen; /* mcast key length */ + uint8_t rsn_ucastcipherset; /* unicast cipher set */ + uint8_t rsn_ucastcipher; /* selected unicast cipher */ + uint8_t rsn_ucastkeylen; /* unicast key length */ + uint8_t rsn_keymgmtset; /* key mangement algorithms */ + uint8_t rsn_keymgmt; /* selected key mgmt algo */ + uint16_t rsn_caps; /* capabilities */ }; struct ieee80211_node_table; @@ -94,8 +94,8 @@ LIST_ENTRY(ieee80211_node) ni_hash; u_int ni_refcnt; u_int ni_scangen; /* gen# for timeout scan */ - u_int8_t ni_authmode; /* authentication algorithm */ - u_int8_t ni_ath_flags; /* Atheros feature flags */ + uint8_t ni_authmode; /* authentication algorithm */ + uint8_t ni_ath_flags; /* Atheros feature flags */ /* NB: These must have the same values as IEEE80211_ATHC_* */ #define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */ #define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */ @@ -105,7 +105,7 @@ #define IEEE80211_NODE_BOOST 0x0080 #define IEEE80211_NODE_PSUPDATE 0x0200 /* power save state changed */ #define IEEE80211_NODE_CHWUPDATE 0x0400 /* 11n channel width change */ - u_int16_t ni_flags; /* special-purpose state */ + uint16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ #define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ @@ -114,59 +114,59 @@ #define IEEE80211_NODE_AREF 0x0020 /* authentication ref held */ #define IEEE80211_NODE_HT 0x0040 /* HT enabled */ #define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ - u_int16_t ni_ath_defkeyix;/* Atheros def key index */ - u_int16_t ni_associd; /* assoc response */ - u_int16_t ni_txpower; /* current transmit power */ - u_int16_t ni_vlan; /* vlan tag */ - u_int32_t *ni_challenge; /* shared-key challenge */ - u_int8_t *ni_wpa_ie; /* captured WPA ie */ - u_int8_t *ni_rsn_ie; /* captured RSN ie */ - u_int8_t *ni_wme_ie; /* captured WME ie */ - u_int8_t *ni_ath_ie; /* captured Atheros ie */ + uint16_t ni_ath_defkeyix;/* Atheros def key index */ + uint16_t ni_associd; /* assoc response */ + uint16_t ni_txpower; /* current transmit power */ + uint16_t ni_vlan; /* vlan tag */ + uint32_t *ni_challenge; /* shared-key challenge */ + uint8_t *ni_wpa_ie; /* captured WPA ie */ + uint8_t *ni_rsn_ie; /* captured RSN ie */ + uint8_t *ni_wme_ie; /* captured WME ie */ + uint8_t *ni_ath_ie; /* captured Atheros ie */ #define IEEE80211_NONQOS_TID 16 /* index for non-QoS sta */ - u_int16_t ni_txseqs[17]; /* tx seq per-tid */ - u_int16_t ni_rxseqs[17]; /* rx seq previous per-tid*/ - u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ + uint16_t ni_txseqs[17]; /* tx seq per-tid */ + uint16_t ni_rxseqs[17]; /* rx seq previous per-tid*/ + uint32_t ni_rxfragstamp; /* time stamp of last rx frag */ struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */ struct ieee80211_rsnparms ni_rsn; /* RSN/WPA parameters */ struct ieee80211_key ni_ucastkey; /* unicast key */ /* hardware */ - u_int32_t ni_rstamp; /* recv timestamp */ + uint32_t ni_rstamp; /* recv timestamp */ int8_t ni_rssi; /* recv ssi */ int8_t ni_noise; /* noise floor */ /* header */ - u_int8_t ni_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t ni_bssid[IEEE80211_ADDR_LEN]; + uint8_t ni_macaddr[IEEE80211_ADDR_LEN]; + uint8_t ni_bssid[IEEE80211_ADDR_LEN]; /* beacon, probe response */ union { - u_int8_t data[8]; - u_int64_t tsf; + uint8_t data[8]; + uint64_t tsf; } ni_tstamp; /* from last rcv'd beacon */ - u_int16_t ni_intval; /* beacon interval */ - u_int16_t ni_capinfo; /* capabilities */ - u_int8_t ni_esslen; - u_int8_t ni_essid[IEEE80211_NWID_LEN]; + uint16_t ni_intval; /* beacon interval */ + uint16_t ni_capinfo; /* capabilities */ + uint8_t ni_esslen; + uint8_t ni_essid[IEEE80211_NWID_LEN]; struct ieee80211_rateset ni_rates; /* negotiated rate set */ struct ieee80211_channel *ni_chan; - u_int16_t ni_fhdwell; /* FH only */ - u_int8_t ni_fhindex; /* FH only */ - u_int8_t ni_erp; /* ERP from beacon/probe resp */ - u_int16_t ni_timoff; /* byte offset to TIM ie */ - u_int8_t ni_dtim_period; /* DTIM period */ - u_int8_t ni_dtim_count; /* DTIM count for last bcn */ + uint16_t ni_fhdwell; /* FH only */ + uint8_t ni_fhindex; /* FH only */ + uint8_t ni_erp; /* ERP from beacon/probe resp */ + uint16_t ni_timoff; /* byte offset to TIM ie */ + uint8_t ni_dtim_period; /* DTIM period */ + uint8_t ni_dtim_count; /* DTIM count for last bcn */ /* 11n state */ - u_int16_t ni_htcap; /* HT capabilities */ - u_int8_t ni_htparam; /* HT params */ - u_int8_t ni_htctlchan; /* HT control channel */ - u_int8_t ni_ht2ndchan; /* HT 2nd channel */ - u_int8_t ni_htopmode; /* HT operating mode */ - u_int8_t ni_htstbc; /* HT */ - u_int8_t ni_reqcw; /* requested tx channel width */ - u_int8_t ni_chw; /* negotiated channel width */ + uint16_t ni_htcap; /* HT capabilities */ + uint8_t ni_htparam; /* HT params */ + uint8_t ni_htctlchan; /* HT control channel */ + uint8_t ni_ht2ndchan; /* HT 2nd channel */ + uint8_t ni_htopmode; /* HT operating mode */ + uint8_t ni_htstbc; /* HT */ + uint8_t ni_reqcw; /* requested tx channel width */ + uint8_t ni_chw; /* negotiated channel width */ struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */ struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC]; struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID]; @@ -247,34 +247,34 @@ }; struct ieee80211_node *ieee80211_alloc_node( - struct ieee80211_node_table *, const u_int8_t *); + struct ieee80211_node_table *, const uint8_t *); struct ieee80211_node *ieee80211_tmp_node(struct ieee80211com *, - const u_int8_t *macaddr); + const uint8_t *macaddr); struct ieee80211_node *ieee80211_dup_bss(struct ieee80211_node_table *, - const u_int8_t *); + const uint8_t *); #ifdef IEEE80211_DEBUG_REFCNT void ieee80211_free_node_debug(struct ieee80211_node *, const char *func, int line); struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211_node_table *, - const u_int8_t *, + const uint8_t *, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_debug(struct ieee80211com *, const struct ieee80211_frame_min *, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_withkey_debug( struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix, + const struct ieee80211_frame_min *, uint16_t keyix, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_withkey_debug( struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix, + const struct ieee80211_frame_min *, uint16_t keyix, const char *func, int line); struct ieee80211_node *ieee80211_find_txnode_debug(struct ieee80211com *, - const u_int8_t *, + const uint8_t *, const char *func, int line); struct ieee80211_node *ieee80211_find_node_with_ssid_debug( - struct ieee80211_node_table *, const u_int8_t *macaddr, - u_int ssidlen, const u_int8_t *ssid, + struct ieee80211_node_table *, const uint8_t *macaddr, + u_int ssidlen, const uint8_t *ssid, const char *func, int line); #define ieee80211_free_node(ni) \ ieee80211_free_node_debug(ni, __func__, __LINE__) @@ -291,16 +291,16 @@ #else void ieee80211_free_node(struct ieee80211_node *); struct ieee80211_node *ieee80211_find_node(struct ieee80211_node_table *, - const u_int8_t *); + const uint8_t *); struct ieee80211_node * ieee80211_find_rxnode(struct ieee80211com *, const struct ieee80211_frame_min *); struct ieee80211_node * ieee80211_find_rxnode_withkey(struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix); + const struct ieee80211_frame_min *, uint16_t keyix); struct ieee80211_node *ieee80211_find_txnode(struct ieee80211com *, - const u_int8_t *); + const uint8_t *); struct ieee80211_node *ieee80211_find_node_with_ssid( - struct ieee80211_node_table *, const u_int8_t *macaddr, - u_int ssidlen, const u_int8_t *ssid); + struct ieee80211_node_table *, const uint8_t *macaddr, + u_int ssidlen, const uint8_t *ssid); #endif int ieee80211_node_delucastkey(struct ieee80211_node *); void ieee80211_node_timeout(void *arg); @@ -314,7 +314,7 @@ void ieee80211_dump_nodes(struct ieee80211_node_table *); struct ieee80211_node *ieee80211_fakeup_adhoc_node( - struct ieee80211_node_table *, const u_int8_t macaddr[]); + struct ieee80211_node_table *, const uint8_t macaddr[]); struct ieee80211_scanparams; void ieee80211_init_neighbor(struct ieee80211_node *, const struct ieee80211_frame *,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705130456.l4D4uK9J049140>