Date: Sun, 13 May 2007 04:26:42 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 119748 for review Message-ID: <200705130426.l4D4Qg4N035946@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=119748 Change 119748 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:26:38 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#57 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#57 (text+ko) ==== @@ -101,25 +101,25 @@ ieee80211_beacon_lock_t ic_beaconlock; /* beacon update lock */ struct ieee80211_stats ic_stats; /* statistics */ struct sysctl_ctx_list *ic_sysctl; /* dynamic sysctl context */ - u_int32_t ic_debug; /* debug msg flags */ + uint32_t ic_debug; /* debug msg flags */ int ic_vap; /* virtual AP index */ int ic_headroom; /* driver tx headroom needs */ enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */ enum ieee80211_opmode ic_opmode; /* operation mode */ struct ifmedia ic_media; /* interface media config */ - u_int8_t ic_myaddr[IEEE80211_ADDR_LEN]; + uint8_t ic_myaddr[IEEE80211_ADDR_LEN]; - u_int32_t ic_flags; /* state flags */ - u_int32_t ic_flags_ext; /* extended state flags */ - u_int32_t ic_caps; /* capabilities */ - u_int8_t ic_modecaps[2]; /* set of mode capabilities */ - u_int16_t ic_curmode; /* current mode */ + uint32_t ic_flags; /* state flags */ + uint32_t ic_flags_ext; /* extended state flags */ + uint32_t ic_caps; /* capabilities */ + uint8_t ic_modecaps[2]; /* set of mode capabilities */ + uint16_t ic_curmode; /* current mode */ struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX]; - u_int16_t ic_bintval; /* beacon interval */ - u_int16_t ic_lintval; /* listen interval */ - u_int16_t ic_holdover; /* PM hold over duration */ - u_int16_t ic_txpowlimit; /* global tx power limit */ - u_int32_t ic_htcaps; /* HT capabilities */ + uint16_t ic_bintval; /* beacon interval */ + uint16_t ic_lintval; /* listen interval */ + uint16_t ic_holdover; /* PM hold over duration */ + uint16_t ic_txpowlimit; /* global tx power limit */ + uint32_t ic_htcaps; /* HT capabilities */ int ic_ampdu_rxmax; /* A-MPDU rx limit (bytes) */ int ic_ampdu_density;/* A-MPDU density */ int ic_ampdu_limit; /* A-MPDU tx limit (bytes) */ @@ -147,15 +147,15 @@ */ int ic_nchans; /* # entries in ic_channels */ struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX+1]; - u_int8_t ic_chan_avail[IEEE80211_CHAN_BYTES]; - u_int8_t ic_chan_active[IEEE80211_CHAN_BYTES]; - u_int8_t ic_chan_scan[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_avail[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_active[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_scan[IEEE80211_CHAN_BYTES]; struct ieee80211_channel *ic_curchan; /* current channel */ struct ieee80211_channel *ic_bsschan; /* bss channel */ struct ieee80211_channel *ic_prevchan; /* previous channel */ int ic_countrycode; /* ISO country code */ - u_int16_t ic_regdomain; /* regulatory domain */ - u_int8_t ic_location; /* unknown, indoor, outdoor */ + uint16_t ic_regdomain; /* regulatory domain */ + uint8_t ic_location; /* unknown, indoor, outdoor */ struct ieee80211_scan_state *ic_scan; /* scan state */ enum ieee80211_roamingmode ic_roaming; /* roaming mode */ @@ -163,7 +163,7 @@ int ic_lastscan; /* time last scan completed */ int ic_des_nssid; /* # desired ssids */ struct ieee80211_scan_ssid ic_des_ssid[1];/* desired ssid table */ - u_int8_t ic_des_bssid[IEEE80211_ADDR_LEN]; + uint8_t ic_des_bssid[IEEE80211_ADDR_LEN]; struct ieee80211_channel *ic_des_chan; /* desired channel */ int ic_des_mode; /* desired phymode */ u_int ic_bgscanidle; /* bg scan idle threshold */ @@ -178,40 +178,40 @@ void *ic_as; /* private aclator state */ enum ieee80211_protmode ic_protmode; /* 802.11g protection mode */ - u_int16_t ic_nonerpsta; /* # non-ERP stations */ - u_int16_t ic_longslotsta; /* # long slot time stations */ - u_int16_t ic_sta_assoc; /* stations associated */ + uint16_t ic_nonerpsta; /* # non-ERP stations */ + uint16_t ic_longslotsta; /* # long slot time stations */ + uint16_t ic_sta_assoc; /* stations associated */ struct ifqueue ic_mgtq; enum ieee80211_state ic_state; /* 802.11 state */ struct callout ic_mgtsend; /* mgmt frame response timer */ - u_int32_t *ic_aid_bitmap; /* association id map */ - u_int16_t ic_max_aid; - u_int16_t ic_ps_sta; /* stations in power save */ - u_int16_t ic_ps_pending; /* ps sta's w/ pending frames */ - u_int8_t *ic_tim_bitmap; /* power-save stations w/ data*/ - u_int16_t ic_tim_len; /* ic_tim_bitmap size (bytes) */ - u_int8_t ic_dtim_period; /* DTIM period */ - u_int8_t ic_dtim_count; /* DTIM count for last bcn */ + uint32_t *ic_aid_bitmap; /* association id map */ + uint16_t ic_max_aid; + uint16_t ic_ps_sta; /* stations in power save */ + uint16_t ic_ps_pending; /* ps sta's w/ pending frames */ + uint8_t *ic_tim_bitmap; /* power-save stations w/ data*/ + uint16_t ic_tim_len; /* ic_tim_bitmap size (bytes) */ + uint8_t ic_dtim_period; /* DTIM period */ + uint8_t ic_dtim_count; /* DTIM count for last bcn */ struct bpf_if *ic_rawbpf; /* packet filter structure */ struct ieee80211_node *ic_bss; /* information for this node */ int ic_fixed_rate; /* 802.11 rate or -1 */ int ic_mcast_rate; /* rate for mcast frames */ - u_int16_t ic_rtsthreshold; - u_int16_t ic_fragthreshold; - u_int8_t ic_bmissthreshold; - u_int8_t ic_bmiss_count; /* current beacon miss count */ + uint16_t ic_rtsthreshold; + uint16_t ic_fragthreshold; + uint8_t ic_bmissthreshold; + uint8_t ic_bmiss_count; /* current beacon miss count */ int ic_bmiss_max; /* max bmiss before scan */ - u_int16_t ic_swbmiss_count;/* beacons in last period */ - u_int16_t ic_swbmiss_period;/* s/w bmiss period */ + uint16_t ic_swbmiss_count;/* beacons in last period */ + uint16_t ic_swbmiss_period;/* s/w bmiss period */ struct callout ic_swbmiss; /* s/w beacon miss timer */ - u_int16_t ic_txmin; /* min tx retry count */ - u_int16_t ic_txmax; /* max tx retry count */ - u_int16_t ic_txlifetime; /* tx lifetime */ + uint16_t ic_txmin; /* min tx retry count */ + uint16_t ic_txmax; /* max tx retry count */ + uint16_t ic_txlifetime; /* tx lifetime */ struct callout ic_inact; /* inactivity timer wait */ void *ic_opt_ie; /* user-specified IE's */ - u_int16_t ic_opt_ie_len; /* length of ni_opt_ie */ + uint16_t ic_opt_ie_len; /* length of ni_opt_ie */ int ic_inact_init; /* initial setting */ int ic_inact_auth; /* auth but not assoc setting */ int ic_inact_run; /* authorized setting */ @@ -236,7 +236,7 @@ struct ieee80211_node *, int, int); void (*ic_recv_mgmt)(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, - int, int, int, u_int32_t); + int, int, int, uint32_t); /* send raw 802.11 frame */ int (*ic_raw_xmit)(struct ieee80211_node *, struct mbuf *, @@ -275,10 +275,10 @@ * from an assocated HT station. */ void (*ic_recv_action)(struct ieee80211_node *, - const u_int8_t *frm, const u_int8_t *efrm); + const uint8_t *frm, const uint8_t *efrm); int (*ic_send_action)(struct ieee80211_node *, int category, int action, - u_int16_t args[4]); + uint16_t args[4]); /* start/stop doing A-MPDU tx aggregation for a station */ int (*ic_addba_request)(struct ieee80211_node *, struct ieee80211_tx_ampdu *, @@ -403,7 +403,7 @@ void ieee80211_announce_channels(struct ieee80211com *); void ieee80211_media_init(struct ieee80211com *, ifm_change_cb_t, ifm_stat_cb_t); -struct ieee80211com *ieee80211_find_vap(const u_int8_t mac[IEEE80211_ADDR_LEN]); +struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]); int ieee80211_media_change(struct ifnet *); void ieee80211_media_status(struct ifnet *, struct ifmediareq *); int ieee80211_ioctl(struct ieee80211com *, u_long, caddr_t); @@ -449,7 +449,7 @@ { int size = ieee80211_hdrsize(data); if (ic->ic_flags & IEEE80211_F_DATAPAD) - size = roundup(size, sizeof(u_int32_t)); + size = roundup(size, sizeof(uint32_t)); return size; } @@ -461,7 +461,7 @@ { int size = ieee80211_anyhdrsize(data); if (ic->ic_flags & IEEE80211_F_DATAPAD) - size = roundup(size, sizeof(u_int32_t)); + size = roundup(size, sizeof(uint32_t)); return size; } @@ -516,7 +516,7 @@ } while (0) void ieee80211_note(struct ieee80211com *ic, const char *fmt, ...); void ieee80211_note_mac(struct ieee80211com *ic, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *fmt, ...); + const uint8_t mac[IEEE80211_ADDR_LEN], const char *fmt, ...); void ieee80211_note_frame(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *fmt, ...); #define ieee80211_msg_debug(_ic) \ @@ -560,7 +560,7 @@ void ieee80211_discard_ie(struct ieee80211com *, const struct ieee80211_frame *, const char *type, const char *fmt, ...); void ieee80211_discard_mac(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, + const uint8_t mac[IEEE80211_ADDR_LEN], const char *type, const char *fmt, ...); #else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705130426.l4D4Qg4N035946>