PERFORCE change 119754 for review
Sepherosa Ziehau
sephe at FreeBSD.org
Sun May 13 05:15:04 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119754
Change 119754 by sephe at sephe_zealot:sam_wifi on 2007/05/13 05:14:38
u_intX_t -> uintX_t
Approved by: sam
Affected files ...
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#56 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#36 edit
Differences ...
==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#56 (text+ko) ====
@@ -244,9 +244,9 @@
}
void
-ieee80211_print_essid(const u_int8_t *essid, int len)
+ieee80211_print_essid(const uint8_t *essid, int len)
{
- const u_int8_t *p;
+ const uint8_t *p;
int i;
if (len > IEEE80211_NWID_LEN)
@@ -270,7 +270,7 @@
void
ieee80211_dump_pkt(struct ieee80211com *ic,
- const u_int8_t *buf, int len, int rate, int rssi)
+ const uint8_t *buf, int len, int rate, int rssi)
{
const struct ieee80211_frame *wh;
int i;
@@ -293,7 +293,7 @@
printf("(%s)", ether_sprintf(wh->i_addr2));
break;
case IEEE80211_FC1_DIR_DSTODS:
- printf("DSDS %s", ether_sprintf((const u_int8_t *)&wh[1]));
+ printf("DSDS %s", ether_sprintf((const uint8_t *)&wh[1]));
printf("->%s", ether_sprintf(wh->i_addr3));
printf("(%s", ether_sprintf(wh->i_addr2));
printf("->%s)", ether_sprintf(wh->i_addr1));
@@ -364,7 +364,7 @@
int i, j, rix, error;
int okrate, badrate, fixedrate;
const struct ieee80211_rateset *srs;
- u_int8_t r;
+ uint8_t r;
error = 0;
okrate = badrate = 0;
@@ -550,11 +550,11 @@
* WME protocol support. The following parameters come from the spec.
*/
typedef struct phyParamType {
- u_int8_t aifsn;
- u_int8_t logcwmin;
- u_int8_t logcwmax;
- u_int16_t txopLimit;
- u_int8_t acm;
+ uint8_t aifsn;
+ uint8_t logcwmin;
+ uint8_t logcwmax;
+ uint16_t txopLimit;
+ uint8_t acm;
} paramType;
static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = {
@@ -833,7 +833,7 @@
if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
ic->ic_sta_assoc < 2 && (wme->wme_flags & WME_F_AGGRMODE) != 0) {
- static const u_int8_t logCwMin[IEEE80211_MODE_MAX] = {
+ static const uint8_t logCwMin[IEEE80211_MODE_MAX] = {
3, /* IEEE80211_MODE_AUTO */
3, /* IEEE80211_MODE_11A */
4, /* IEEE80211_MODE_11B */
==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#36 (text+ko) ====
@@ -58,16 +58,16 @@
struct ieee80211_node;
int ieee80211_input(struct ieee80211com *, struct mbuf *,
- struct ieee80211_node *, int, int, u_int32_t);
+ struct ieee80211_node *, int, int, uint32_t);
void ieee80211_deliver_data(struct ieee80211com *,
struct ieee80211_node *, struct mbuf *);
struct mbuf *ieee80211_decap1(struct mbuf *, int *);
int ieee80211_setup_rates(struct ieee80211_node *ni,
- const u_int8_t *rates, const u_int8_t *xrates, int flags);
-void ieee80211_saveie(u_int8_t **, const u_int8_t *);
-void ieee80211_saveath(struct ieee80211_node *, u_int8_t *);
+ const uint8_t *rates, const uint8_t *xrates, int flags);
+void ieee80211_saveie(uint8_t **, const uint8_t *);
+void ieee80211_saveath(struct ieee80211_node *, uint8_t *);
void ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *,
- struct ieee80211_node *, int, int, int, u_int32_t);
+ struct ieee80211_node *, int, int, int, uint32_t);
int ieee80211_mgmt_output(struct ieee80211com *, struct ieee80211_node *,
struct mbuf *, int type);
struct ieee80211_bpf_params;
@@ -79,10 +79,10 @@
int ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *,
int, int);
int ieee80211_send_probereq(struct ieee80211_node *ni,
- const u_int8_t sa[IEEE80211_ADDR_LEN],
- const u_int8_t da[IEEE80211_ADDR_LEN],
- const u_int8_t bssid[IEEE80211_ADDR_LEN],
- const u_int8_t *ssid, size_t ssidlen,
+ const uint8_t sa[IEEE80211_ADDR_LEN],
+ const uint8_t da[IEEE80211_ADDR_LEN],
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t *ssid, size_t ssidlen,
const void *optie, size_t optielen);
int ieee80211_classify(struct ieee80211com *, struct mbuf *,
struct ieee80211_node *);
@@ -111,7 +111,7 @@
if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
size += IEEE80211_ADDR_LEN;
if (IEEE80211_QOS_HAS_SEQ(wh))
- size += sizeof(u_int16_t);
+ size += sizeof(uint16_t);
return size;
}
@@ -166,11 +166,11 @@
int (*iac_attach)(struct ieee80211com *);
void (*iac_detach)(struct ieee80211com *);
int (*iac_check)(struct ieee80211com *,
- const u_int8_t mac[IEEE80211_ADDR_LEN]);
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
int (*iac_add)(struct ieee80211com *,
- const u_int8_t mac[IEEE80211_ADDR_LEN]);
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
int (*iac_remove)(struct ieee80211com *,
- const u_int8_t mac[IEEE80211_ADDR_LEN]);
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
int (*iac_flush)(struct ieee80211com *);
int (*iac_setpolicy)(struct ieee80211com *, int);
int (*iac_getpolicy)(struct ieee80211com *);
@@ -195,18 +195,18 @@
* WME/WMM support.
*/
struct wmeParams {
- u_int8_t wmep_acm;
- u_int8_t wmep_aifsn;
- u_int8_t wmep_logcwmin; /* log2(cwmin) */
- u_int8_t wmep_logcwmax; /* log2(cwmax) */
- u_int8_t wmep_txopLimit;
- u_int8_t wmep_noackPolicy; /* 0 (ack), 1 (no ack) */
+ uint8_t wmep_acm;
+ uint8_t wmep_aifsn;
+ uint8_t wmep_logcwmin; /* log2(cwmin) */
+ uint8_t wmep_logcwmax; /* log2(cwmax) */
+ uint8_t wmep_txopLimit;
+ uint8_t wmep_noackPolicy; /* 0 (ack), 1 (no ack) */
};
#define IEEE80211_TXOP_TO_US(_txop) ((_txop)<<5)
#define IEEE80211_US_TO_TXOP(_us) ((_us)>>5)
struct chanAccParams {
- u_int8_t cap_info; /* version of the current set */
+ uint8_t cap_info; /* version of the current set */
struct wmeParams cap_wmeParams[WME_NUM_AC];
};
@@ -235,9 +235,9 @@
int ieee80211_init(struct ieee80211com *, int forcescan);
void ieee80211_dturbo_switch(struct ieee80211com *, int newflags);
void ieee80211_beacon_miss(struct ieee80211com *);
-void ieee80211_print_essid(const u_int8_t *, int);
+void ieee80211_print_essid(const uint8_t *, int);
void ieee80211_dump_pkt(struct ieee80211com *,
- const u_int8_t *, int, int, int);
+ const uint8_t *, int, int, int);
extern const char *ieee80211_opmode_name[];
extern const char *ieee80211_state_name[IEEE80211_S_MAX];
@@ -249,14 +249,14 @@
* can update the frame later w/ minimal overhead.
*/
struct ieee80211_beacon_offsets {
- u_int16_t *bo_caps; /* capabilities */
- u_int8_t *bo_tim; /* start of atim/dtim */
- u_int8_t *bo_wme; /* start of WME parameters */
- u_int8_t *bo_trailer; /* start of fixed-size trailer */
- u_int16_t bo_tim_len; /* atim/dtim length in bytes */
- u_int16_t bo_trailer_len; /* trailer length in bytes */
- u_int8_t *bo_erp; /* start of ERP element */
- u_int8_t *bo_htinfo; /* start of HT info element */
+ uint16_t *bo_caps; /* capabilities */
+ uint8_t *bo_tim; /* start of atim/dtim */
+ uint8_t *bo_wme; /* start of WME parameters */
+ uint8_t *bo_trailer; /* start of fixed-size trailer */
+ uint16_t bo_tim_len; /* atim/dtim length in bytes */
+ uint16_t bo_trailer_len; /* trailer length in bytes */
+ uint8_t *bo_erp; /* start of ERP element */
+ uint8_t *bo_htinfo; /* start of HT info element */
};
struct mbuf *ieee80211_beacon_alloc(struct ieee80211com *,
struct ieee80211_node *, struct ieee80211_beacon_offsets *);
More information about the p4-projects
mailing list