3 files changed, 10 insertions, 10 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 5f3951de262..08918813bcd 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $	*/
-/*	$OpenBSD: ieee80211_input.c,v 1.24 2007/06/16 11:56:20 damien Exp $	*/
+/*	$OpenBSD: ieee80211_input.c,v 1.25 2007/06/16 11:59:58 damien Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -1656,13 +1656,13 @@ ieee80211_do_slow_print(struct ieee80211com *ic, int *did_print)
  */
 int
 ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni,
-    uint64_t local_tsft)
+    u_int64_t local_tsft)
 {
-	uint64_t beacon_tsft;
+	u_int64_t beacon_tsft;
 	int did_print = 0, sign;
 	union {
-		uint64_t	word;
-		uint8_t		tstamp[8];
+		u_int64_t	word;
+		u_int8_t	tstamp[8];
 	} u;
 
 	/* ensure alignment */
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 48f13002dae..4f46661b7a0 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.c,v 1.22 2007/06/16 11:56:20 damien Exp $	*/
+/*	$OpenBSD: ieee80211_node.c,v 1.23 2007/06/16 11:59:58 damien Exp $	*/
 /*	$NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $	*/
 
 /*-
@@ -916,7 +916,7 @@ int
 ieee80211_iserp_sta(struct ieee80211_node *ni)
 {
 #define N(a)	(sizeof (a) / sizeof (a)[0])
-	static const uint8_t rates[] = { 2, 4, 11, 22, 12, 24, 48 };
+	static const u_int8_t rates[] = { 2, 4, 11, 22, 12, 24, 48 };
 	struct ieee80211_rateset *rs = &ni->ni_rates;
 	int i, j;
 
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 0037623712c..af5dfcc3866 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_output.c,v 1.27 2007/06/16 11:56:20 damien Exp $	*/
+/*	$OpenBSD: ieee80211_output.c,v 1.28 2007/06/16 11:59:58 damien Exp $	*/
 /*	$NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $	*/
 
 /*-
@@ -884,7 +884,7 @@ ieee80211_get_rts(struct ieee80211com *ic, const struct ieee80211_frame *wh,
 	rts->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_CTL |
 	    IEEE80211_FC0_SUBTYPE_RTS;
 	rts->i_fc[1] = IEEE80211_FC1_DIR_NODS;
-	*(uint16_t *)rts->i_dur = htole16(dur);
+	*(u_int16_t *)rts->i_dur = htole16(dur);
 	IEEE80211_ADDR_COPY(rts->i_ra, wh->i_addr1);
 	IEEE80211_ADDR_COPY(rts->i_ta, wh->i_addr2);
 
@@ -911,7 +911,7 @@ ieee80211_get_cts_to_self(struct ieee80211com *ic, u_int16_t dur)
 	cts->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_CTL |
 	    IEEE80211_FC0_SUBTYPE_CTS;
 	cts->i_fc[1] = IEEE80211_FC1_DIR_NODS;
-	*(uint16_t *)cts->i_dur = htole16(dur);
+	*(u_int16_t *)cts->i_dur = htole16(dur);
 	IEEE80211_ADDR_COPY(cts->i_ra, ic->ic_myaddr);
 
 	return m;