PERFORCE change 119749 for review
Sepherosa Ziehau
sephe at FreeBSD.org
Sun May 13 04:34:55 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119749
Change 119749 by sephe at sephe_zealot:sam_wifi on 2007/05/13 04:34:40
u_intX_t -> uintX_t
Approved by: sam
Affected files ...
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#103 edit
Differences ...
==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#103 (text+ko) ====
@@ -73,7 +73,7 @@
return 1;
}
-static const u_int8_t *ieee80211_getbssid(struct ieee80211com *,
+static const uint8_t *ieee80211_getbssid(struct ieee80211com *,
const struct ieee80211_frame *);
#endif /* IEEE80211_DEBUG */
@@ -81,7 +81,7 @@
struct ieee80211_node *, struct mbuf *, int);
static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *, int);
static void ieee80211_send_error(struct ieee80211com *, struct ieee80211_node *,
- const u_int8_t *mac, int subtype, int arg);
+ const uint8_t *mac, int subtype, int arg);
static struct mbuf *ieee80211_decap_fastframe(struct ieee80211com *,
struct ieee80211_node *, struct mbuf *);
static void ieee80211_recv_pspoll(struct ieee80211com *,
@@ -99,7 +99,7 @@
*/
int
ieee80211_input(struct ieee80211com *ic, struct mbuf *m,
- struct ieee80211_node *ni, int rssi, int noise, u_int32_t rstamp)
+ struct ieee80211_node *ni, int rssi, int noise, uint32_t rstamp)
{
#define SEQ_LEQ(a,b) ((int)((a)-(b)) <= 0)
#define HAS_SEQ(type) ((type & 0x4) == 0)
@@ -108,9 +108,9 @@
struct ieee80211_key *key;
struct ether_header *eh;
int hdrspace, need_tap;
- u_int8_t dir, type, subtype, qos;
- u_int8_t *bssid;
- u_int16_t rxseq;
+ uint8_t dir, type, subtype, qos;
+ uint8_t *bssid;
+ uint16_t rxseq;
if (m->m_flags & M_AMPDU) {
/*
@@ -242,7 +242,7 @@
ni->ni_noise = noise;
ni->ni_rstamp = rstamp;
if (HAS_SEQ(type)) {
- u_int8_t tid;
+ uint8_t tid;
if (IEEE80211_QOS_HAS_SEQ(wh)) {
tid = ((struct ieee80211_qosframe *)wh)->
i_qos[0] & IEEE80211_QOS_TID;
@@ -251,7 +251,7 @@
tid++;
} else
tid = IEEE80211_NONQOS_TID;
- rxseq = le16toh(*(u_int16_t *)wh->i_seq);
+ rxseq = le16toh(*(uint16_t *)wh->i_seq);
if ((ni->ni_flags & IEEE80211_NODE_HT) == 0 &&
(wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) {
@@ -516,7 +516,7 @@
ic->ic_stats.is_rx_tooshort++;
return IEEE80211_FC0_TYPE_DATA;
}
- llc = (struct llc *)(mtod(m, u_int8_t *) +
+ llc = (struct llc *)(mtod(m, uint8_t *) +
sizeof(struct ether_header));
if (llc->llc_snap.ether_type == htons(ATH_FF_ETH_TYPE)) {
m_adj(m, FF_LLC_SIZE);
@@ -632,14 +632,14 @@
{
struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *);
struct ieee80211_frame *lwh;
- u_int16_t rxseq;
- u_int8_t fragno;
- u_int8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG;
+ uint16_t rxseq;
+ uint8_t fragno;
+ uint8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG;
struct mbuf *mfrag;
KASSERT(!IEEE80211_IS_MULTICAST(wh->i_addr1), ("multicast fragm?"));
- rxseq = le16toh(*(u_int16_t *)wh->i_seq);
+ rxseq = le16toh(*(uint16_t *)wh->i_seq);
fragno = rxseq & IEEE80211_SEQ_FRAG_MASK;
/* Quick way out, if there's nothing to defragment */
@@ -672,10 +672,10 @@
* related to the previous ones.
*/
if (mfrag != NULL) {
- u_int16_t last_rxseq;
+ uint16_t last_rxseq;
lwh = mtod(mfrag, struct ieee80211_frame *);
- last_rxseq = le16toh(*(u_int16_t *)lwh->i_seq);
+ last_rxseq = le16toh(*(uint16_t *)lwh->i_seq);
/* NB: check seq # and frag together */
if (rxseq != last_rxseq+1 ||
!IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1) ||
@@ -704,7 +704,7 @@
mfrag->m_pkthdr.len += m->m_pkthdr.len;
/* track last seqnum and fragno */
lwh = mtod(mfrag, struct ieee80211_frame *);
- *(u_int16_t *) lwh->i_seq = *(u_int16_t *) wh->i_seq;
+ *(uint16_t *) lwh->i_seq = *(uint16_t *) wh->i_seq;
}
if (more_frag) { /* more to come, save */
ni->ni_rxfragstamp = ticks;
@@ -825,7 +825,7 @@
break;
}
#ifdef ALIGNED_POINTER
- if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), u_int32_t)) {
+ if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) {
struct mbuf *n, *n0, **np;
caddr_t newdata;
int off, pktlen;
@@ -907,7 +907,7 @@
*framelen = ntohs(eh->ether_type) /* encap'd frame size */
+ sizeof(struct ether_header) - sizeof(struct llc);
eh->ether_type = llc->llc_un.type_snap.ether_type;
- ovbcopy(eh, mtod(m, u_int8_t *) + sizeof(struct llc),
+ ovbcopy(eh, mtod(m, uint8_t *) + sizeof(struct llc),
sizeof(struct ether_header));
m_adj(m, sizeof(struct llc));
return m;
@@ -924,11 +924,11 @@
struct ieee80211_node *ni, struct mbuf *m)
{
#define MS(x,f) (((x) & f) >> f##_S)
- u_int32_t ath;
+ uint32_t ath;
struct mbuf *n;
int framelen;
- m_copydata(m, 0, sizeof(u_int32_t), (caddr_t) &ath);
+ m_copydata(m, 0, sizeof(uint32_t), (caddr_t) &ath);
if (MS(ath, ATH_FF_PROTO) != ATH_FF_PROTO_L2TUNNEL) {
IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY,
ni->ni_macaddr, "fast-frame",
@@ -938,7 +938,7 @@
return NULL;
}
/* NB: skip header and alignment padding */
- m_adj(m, roundup(sizeof(u_int32_t) - 2, 4) + 2);
+ m_adj(m, roundup(sizeof(uint32_t) - 2, 4) + 2);
ic->ic_stats.is_ff_decap++;
@@ -985,7 +985,7 @@
*/
int
ieee80211_setup_rates(struct ieee80211_node *ni,
- const u_int8_t *rates, const u_int8_t *xrates, int flags)
+ const uint8_t *rates, const uint8_t *xrates, int flags)
{
struct ieee80211com *ic = ni->ni_ic;
struct ieee80211_rateset *rs = &ni->ni_rates;
@@ -994,7 +994,7 @@
rs->rs_nrates = rates[1];
memcpy(rs->rs_rates, rates + 2, rs->rs_nrates);
if (xrates != NULL) {
- u_int8_t nxrates;
+ uint8_t nxrates;
/*
* Tack on 11g extended supported rate element.
*/
@@ -1015,8 +1015,8 @@
static void
ieee80211_auth_open(struct ieee80211com *ic, struct ieee80211_frame *wh,
- struct ieee80211_node *ni, int rssi, int noise, u_int32_t rstamp,
- u_int16_t seq, u_int16_t status)
+ struct ieee80211_node *ni, int rssi, int noise, uint32_t rstamp,
+ uint16_t seq, uint16_t status)
{
if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
@@ -1117,7 +1117,7 @@
*/
static void
ieee80211_send_error(struct ieee80211com *ic, struct ieee80211_node *ni,
- const u_int8_t *mac, int subtype, int arg)
+ const uint8_t *mac, int subtype, int arg)
{
int istmp;
@@ -1139,7 +1139,7 @@
alloc_challenge(struct ieee80211com *ic, struct ieee80211_node *ni)
{
if (ni->ni_challenge == NULL)
- MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN,
+ MALLOC(ni->ni_challenge, uint32_t*, IEEE80211_CHALLENGE_LEN,
M_80211_NODE, M_NOWAIT);
if (ni->ni_challenge == NULL) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
@@ -1153,10 +1153,10 @@
/* XXX TODO: add statistics */
static void
ieee80211_auth_shared(struct ieee80211com *ic, struct ieee80211_frame *wh,
- u_int8_t *frm, u_int8_t *efrm, struct ieee80211_node *ni,
- int rssi, int noise, u_int32_t rstamp, u_int16_t seq, u_int16_t status)
+ uint8_t *frm, uint8_t *efrm, struct ieee80211_node *ni,
+ int rssi, int noise, uint32_t rstamp, uint16_t seq, uint16_t status)
{
- u_int8_t *challenge;
+ uint8_t *challenge;
int allocbs, estatus;
/*
@@ -1417,7 +1417,7 @@
#ifdef IEEE80211_DEBUG
static void
ieee80211_ssid_mismatch(struct ieee80211com *ic, const char *tag,
- u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid)
+ uint8_t mac[IEEE80211_ADDR_LEN], uint8_t *ssid)
{
printf("[%s] discard %s frame, ssid mismatch: ",
ether_sprintf(mac), tag);
@@ -1451,56 +1451,56 @@
/* unalligned little endian access */
#define LE_READ_2(p) \
- ((u_int16_t) \
- ((((const u_int8_t *)(p))[0] ) | \
- (((const u_int8_t *)(p))[1] << 8)))
+ ((uint16_t) \
+ ((((const uint8_t *)(p))[0] ) | \
+ (((const uint8_t *)(p))[1] << 8)))
#define LE_READ_4(p) \
- ((u_int32_t) \
- ((((const u_int8_t *)(p))[0] ) | \
- (((const u_int8_t *)(p))[1] << 8) | \
- (((const u_int8_t *)(p))[2] << 16) | \
- (((const u_int8_t *)(p))[3] << 24)))
+ ((uint32_t) \
+ ((((const uint8_t *)(p))[0] ) | \
+ (((const uint8_t *)(p))[1] << 8) | \
+ (((const uint8_t *)(p))[2] << 16) | \
+ (((const uint8_t *)(p))[3] << 24)))
static __inline int
-iswpaoui(const u_int8_t *frm)
+iswpaoui(const uint8_t *frm)
{
return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
}
static __inline int
-iswmeoui(const u_int8_t *frm)
+iswmeoui(const uint8_t *frm)
{
return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI);
}
static __inline int
-iswmeparam(const u_int8_t *frm)
+iswmeparam(const uint8_t *frm)
{
return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
frm[6] == WME_PARAM_OUI_SUBTYPE;
}
static __inline int
-iswmeinfo(const u_int8_t *frm)
+iswmeinfo(const uint8_t *frm)
{
return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
frm[6] == WME_INFO_OUI_SUBTYPE;
}
static __inline int
-isatherosoui(const u_int8_t *frm)
+isatherosoui(const uint8_t *frm)
{
return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
}
static __inline int
-ishtcapoui(const u_int8_t *frm)
+ishtcapoui(const uint8_t *frm)
{
return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTCAP<<24)|BCM_OUI);
}
static __inline int
-ishtinfooui(const u_int8_t *frm)
+ishtinfooui(const uint8_t *frm)
{
return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTINFO<<24)|BCM_OUI);
}
@@ -1511,10 +1511,10 @@
* record any key length.
*/
static int
-wpa_cipher(u_int8_t *sel, u_int8_t *keylen)
+wpa_cipher(uint8_t *sel, uint8_t *keylen)
{
#define WPA_SEL(x) (((x)<<24)|WPA_OUI)
- u_int32_t w = LE_READ_4(sel);
+ uint32_t w = LE_READ_4(sel);
switch (w) {
case WPA_SEL(WPA_CSE_NULL):
@@ -1541,10 +1541,10 @@
* to an internal code.
*/
static int
-wpa_keymgmt(u_int8_t *sel)
+wpa_keymgmt(uint8_t *sel)
{
#define WPA_SEL(x) (((x)<<24)|WPA_OUI)
- u_int32_t w = LE_READ_4(sel);
+ uint32_t w = LE_READ_4(sel);
switch (w) {
case WPA_SEL(WPA_ASE_8021X_UNSPEC):
@@ -1564,11 +1564,11 @@
* configured for the system.
*/
static int
-ieee80211_parse_wpa(struct ieee80211com *ic, u_int8_t *frm,
+ieee80211_parse_wpa(struct ieee80211com *ic, uint8_t *frm,
struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh)
{
- u_int8_t len = frm[1];
- u_int32_t w;
+ uint8_t len = frm[1];
+ uint32_t w;
int n;
/*
@@ -1676,10 +1676,10 @@
* record any key length.
*/
static int
-rsn_cipher(u_int8_t *sel, u_int8_t *keylen)
+rsn_cipher(uint8_t *sel, uint8_t *keylen)
{
#define RSN_SEL(x) (((x)<<24)|RSN_OUI)
- u_int32_t w = LE_READ_4(sel);
+ uint32_t w = LE_READ_4(sel);
switch (w) {
case RSN_SEL(RSN_CSE_NULL):
@@ -1708,10 +1708,10 @@
* to an internal code.
*/
static int
-rsn_keymgmt(u_int8_t *sel)
+rsn_keymgmt(uint8_t *sel)
{
#define RSN_SEL(x) (((x)<<24)|RSN_OUI)
- u_int32_t w = LE_READ_4(sel);
+ uint32_t w = LE_READ_4(sel);
switch (w) {
case RSN_SEL(RSN_ASE_8021X_UNSPEC):
@@ -1731,11 +1731,11 @@
* configured for the system.
*/
static int
-ieee80211_parse_rsn(struct ieee80211com *ic, u_int8_t *frm,
+ieee80211_parse_rsn(struct ieee80211com *ic, uint8_t *frm,
struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh)
{
- u_int8_t len = frm[1];
- u_int32_t w;
+ uint8_t len = frm[1];
+ uint32_t w;
int n;
/*
@@ -1839,7 +1839,7 @@
}
static int
-ieee80211_parse_wmeparams(struct ieee80211com *ic, u_int8_t *frm,
+ieee80211_parse_wmeparams(struct ieee80211com *ic, uint8_t *frm,
const struct ieee80211_frame *wh)
{
#define MS(_v, _f) (((_v) & _f) >> _f##_S)
@@ -1876,14 +1876,14 @@
}
static int
-ieee80211_parse_athparams(struct ieee80211_node *ni, u_int8_t *frm,
+ieee80211_parse_athparams(struct ieee80211_node *ni, uint8_t *frm,
const struct ieee80211_frame *wh)
{
struct ieee80211com *ic = ni->ni_ic;
const struct ieee80211_ath_ie *ath;
u_int len = frm[1];
int capschanged;
- u_int16_t defkeyix;
+ uint16_t defkeyix;
if (len < sizeof(struct ieee80211_ath_ie)-2) {
IEEE80211_DISCARD_IE(ic,
@@ -1903,7 +1903,7 @@
ni->ni_ath_flags, ni->ni_ath_defkeyix);
}
if (IEEE80211_ATH_CAP(ic, ni, ATHEROS_CAP_TURBO_PRIME)) {
- u_int16_t curflags, newflags;
+ uint16_t curflags, newflags;
/*
* Check for turbo mode switch. Calculate flags
@@ -1922,7 +1922,7 @@
}
void
-ieee80211_saveath(struct ieee80211_node *ni, u_int8_t *ie)
+ieee80211_saveath(struct ieee80211_node *ni, uint8_t *ie)
{
const struct ieee80211_ath_ie *ath =
(const struct ieee80211_ath_ie *) ie;
@@ -1933,7 +1933,7 @@
}
void
-ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie)
+ieee80211_saveie(uint8_t **iep, const uint8_t *ie)
{
u_int ielen = ie[1]+2;
/*
@@ -1952,10 +1952,10 @@
/* XXX find a better place for definition */
struct l2_update_frame {
struct ether_header eh;
- u_int8_t dsap;
- u_int8_t ssap;
- u_int8_t control;
- u_int8_t xid[3];
+ uint8_t dsap;
+ uint8_t ssap;
+ uint8_t control;
+ uint8_t xid[3];
} __packed;
/*
@@ -2047,19 +2047,19 @@
void
ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0,
struct ieee80211_node *ni,
- int subtype, int rssi, int noise, u_int32_t rstamp)
+ int subtype, int rssi, int noise, uint32_t rstamp)
{
#define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP)
#define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP)
struct ieee80211_frame *wh;
- u_int8_t *frm, *efrm;
- u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath, *htcap;
+ uint8_t *frm, *efrm;
+ uint8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath, *htcap;
int reassoc, resp, allocbs;
- u_int8_t rate;
+ uint8_t rate;
wh = mtod(m0, struct ieee80211_frame *);
- frm = (u_int8_t *)&wh[1];
- efrm = mtod(m0, u_int8_t *) + m0->m_len;
+ frm = (uint8_t *)&wh[1];
+ efrm = mtod(m0, uint8_t *) + m0->m_len;
switch (subtype) {
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
case IEEE80211_FC0_SUBTYPE_BEACON: {
@@ -2099,8 +2099,8 @@
IEEE80211_VERIFY_LENGTH(efrm - frm, 12, return);
memset(&scan, 0, sizeof(scan));
scan.tstamp = frm; frm += 8;
- scan.bintval = le16toh(*(u_int16_t *)frm); frm += 2;
- scan.capinfo = le16toh(*(u_int16_t *)frm); frm += 2;
+ scan.bintval = le16toh(*(uint16_t *)frm); frm += 2;
+ scan.capinfo = le16toh(*(uint16_t *)frm); frm += 2;
scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan);
scan.chan = scan.bchan;
@@ -2134,7 +2134,7 @@
case IEEE80211_ELEMID_TIM:
/* XXX ATIM? */
scan.tim = frm;
- scan.timoff = frm - mtod(m0, u_int8_t *);
+ scan.timoff = frm - mtod(m0, uint8_t *);
break;
case IEEE80211_ELEMID_IBSSPARMS:
break;
@@ -2516,7 +2516,7 @@
break;
case IEEE80211_FC0_SUBTYPE_AUTH: {
- u_int16_t algo, seq, status;
+ uint16_t algo, seq, status;
/*
* auth frame format
* [2] algorithm
@@ -2525,9 +2525,9 @@
* [tlv*] challenge
*/
IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return);
- algo = le16toh(*(u_int16_t *)frm);
- seq = le16toh(*(u_int16_t *)(frm + 2));
- status = le16toh(*(u_int16_t *)(frm + 4));
+ algo = le16toh(*(uint16_t *)frm);
+ seq = le16toh(*(uint16_t *)(frm + 2));
+ status = le16toh(*(uint16_t *)(frm + 4));
IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH,
"[%s] recv auth frame with algorithm %d seq %d\n",
ether_sprintf(wh->i_addr2), algo, seq);
@@ -2581,9 +2581,9 @@
case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: {
- u_int16_t capinfo, lintval;
+ uint16_t capinfo, lintval;
struct ieee80211_rsnparms rsnparms;
- u_int8_t reason;
+ uint8_t reason;
int badwparsn;
if (ic->ic_opmode != IEEE80211_M_HOSTAP ||
@@ -2620,8 +2620,8 @@
ic->ic_stats.is_rx_assoc_bss++;
return;
}
- capinfo = le16toh(*(u_int16_t *)frm); frm += 2;
- lintval = le16toh(*(u_int16_t *)frm); frm += 2;
+ capinfo = le16toh(*(uint16_t *)frm); frm += 2;
+ lintval = le16toh(*(uint16_t *)frm); frm += 2;
if (reassoc)
frm += 6; /* ignore current AP info */
ssid = rates = xrates = wpa = rsn = wme = ath = htcap = NULL;
@@ -2872,8 +2872,8 @@
case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: {
- u_int16_t capinfo, associd;
- u_int16_t status;
+ uint16_t capinfo, associd;
+ uint16_t status;
if (ic->ic_opmode != IEEE80211_M_STA ||
ic->ic_state != IEEE80211_S_ASSOC) {
@@ -2893,9 +2893,9 @@
*/
IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return);
ni = ic->ic_bss;
- capinfo = le16toh(*(u_int16_t *)frm);
+ capinfo = le16toh(*(uint16_t *)frm);
frm += 2;
- status = le16toh(*(u_int16_t *)frm);
+ status = le16toh(*(uint16_t *)frm);
frm += 2;
if (status != 0) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC,
@@ -2907,7 +2907,7 @@
ic->ic_stats.is_rx_auth_fail++; /* XXX */
return;
}
- associd = le16toh(*(u_int16_t *)frm);
+ associd = le16toh(*(uint16_t *)frm);
frm += 2;
rates = xrates = wme = htcap = NULL;
@@ -3005,7 +3005,7 @@
}
case IEEE80211_FC0_SUBTYPE_DEAUTH: {
- u_int16_t reason;
+ uint16_t reason;
if (ic->ic_state == IEEE80211_S_SCAN) {
ic->ic_stats.is_rx_mgtdiscard++;
@@ -3016,7 +3016,7 @@
* [2] reason
*/
IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
- reason = le16toh(*(u_int16_t *)frm);
+ reason = le16toh(*(uint16_t *)frm);
ic->ic_stats.is_rx_deauth++;
IEEE80211_NODE_STAT(ni, rx_deauth);
@@ -3045,7 +3045,7 @@
}
case IEEE80211_FC0_SUBTYPE_DISASSOC: {
- u_int16_t reason;
+ uint16_t reason;
if (ic->ic_state != IEEE80211_S_RUN &&
ic->ic_state != IEEE80211_S_ASSOC &&
@@ -3058,7 +3058,7 @@
* [2] reason
*/
IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
- reason = le16toh(*(u_int16_t *)frm);
+ reason = le16toh(*(uint16_t *)frm);
ic->ic_stats.is_rx_disassoc++;
IEEE80211_NODE_STAT(ni, rx_disassoc);
@@ -3164,7 +3164,7 @@
{
struct ieee80211_frame_min *wh;
struct mbuf *m;
- u_int16_t aid;
+ uint16_t aid;
int qlen;
wh = mtod(m0, struct ieee80211_frame_min *);
@@ -3178,7 +3178,7 @@
return;
}
- aid = le16toh(*(u_int16_t *)wh->i_dur);
+ aid = le16toh(*(uint16_t *)wh->i_dur);
if (aid != ni->ni_associd) {
IEEE80211_DISCARD(ic, IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG,
(struct ieee80211_frame *) wh, "ps-poll",
@@ -3231,7 +3231,7 @@
/*
* Return the bssid of a frame.
*/
-static const u_int8_t *
+static const uint8_t *
ieee80211_getbssid(struct ieee80211com *ic, const struct ieee80211_frame *wh)
{
if (ic->ic_opmode == IEEE80211_M_STA)
@@ -3273,7 +3273,7 @@
void
ieee80211_note_mac(struct ieee80211com *ic,
- const u_int8_t mac[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN],
const char *fmt, ...)
{
char buf[128]; /* XXX */
@@ -3325,7 +3325,7 @@
void
ieee80211_discard_mac(struct ieee80211com *ic,
- const u_int8_t mac[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN],
const char *type, const char *fmt, ...)
{
va_list ap;
More information about the p4-projects
mailing list