fixup printf arguments for 64-bit machines

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 89ff8ba..1d08e0f 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -614,7 +614,7 @@ wep_encrypt(u8 *key, struct mbuf *m0, u_int off, size_t data_len,
 		m = m->m_next;
 		if (m == NULL) {
 			KASSERT(data_len == 0,
-			    ("out of buffers with data_len %u\n", data_len));
+			    ("out of buffers with data_len %zu\n", data_len));
 			break;
 		}
 		pos = mtod(m, uint8_t *);
@@ -672,7 +672,7 @@ wep_decrypt(u8 *key, struct mbuf *m, u_int off, size_t data_len)
 		m = m->m_next;
 		if (m == NULL) {
 			KASSERT(data_len == 0,
-			    ("out of buffers with data_len %u\n", data_len));
+			    ("out of buffers with data_len %zu\n", data_len));
 			break;
 		}
 		pos = mtod(m, uint8_t *);
@@ -824,7 +824,7 @@ michael_mic(struct tkip_ctx *ctx, const u8 *key,
 			break;
 		m = m->m_next;
 		if (m == NULL) {
-			KASSERT(0, ("out of data, data_len %u\n", data_len));
+			KASSERT(0, ("out of data, data_len %zu\n", data_len));
 			break;
 		}
 		if (space != 0) {
@@ -835,7 +835,7 @@ michael_mic(struct tkip_ctx *ctx, const u8 *key,
 			data_next = mtod(m, const uint8_t *);
 			KASSERT(m->m_len >= sizeof(uint32_t) - space,
 				("not enough data in following buffer, "
-				"m_len %u need %u\n", m->m_len,
+				"m_len %u need %zu\n", m->m_len,
 				sizeof(uint32_t) - space));
 			switch (space) {
 			case 1:
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 2edb5bb..2503f53 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -354,7 +354,7 @@ wep_encrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen)
 			if (data_len != 0) {		/* out of data */
 				IEEE80211_DPRINTF(ctx->wc_ic,
 				    IEEE80211_MSG_CRYPTO,
-				    "[%s] out of data for WEP (data_len %u)\n",
+				    "[%s] out of data for WEP (data_len %zu)\n",
 				    ether_sprintf(mtod(m0,
 					struct ieee80211_frame *)->i_addr2),
 				    data_len);
@@ -438,7 +438,7 @@ wep_decrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen)
 			if (data_len != 0) {		/* out of data */
 				IEEE80211_DPRINTF(ctx->wc_ic,
 				    IEEE80211_MSG_CRYPTO,
-				    "[%s] out of data for WEP (data_len %u)\n",
+				    "[%s] out of data for WEP (data_len %zu)\n",
 				    ether_sprintf(mtod(m0,
 					struct ieee80211_frame *)->i_addr2),
 				    data_len);
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index 26ce11b..3a2ee7b 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -258,9 +258,9 @@ ieee80211_notify_replay_failure(struct ieee80211com *ic,
 	struct ifnet *ifp = ic->ic_ifp;
 
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO,
-		"[%s] %s replay detected <rsc %llu, csc %llu>\n",
+		"[%s] %s replay detected <rsc %ju, csc %ju>\n",
 		ether_sprintf(wh->i_addr2), k->wk_cipher->ic_name,
-		rsc, k->wk_keyrsc);
+		(intmax_t) rsc, (intmax_t) k->wk_keyrsc);
 
 	if (ifp != NULL) {		/* NB: for cipher test modules */
 		struct ieee80211_replay_event iev;
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 219bc25..0562dad 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -239,7 +239,7 @@ ieee80211_mbuf_adjust(struct ieee80211com *ic, int hdrsize,
 			return NULL;
 		}
 		KASSERT(needed_space <= MHLEN,
-		    ("not enough room, need %u got %u\n", needed_space, MHLEN));
+		    ("not enough room, need %u got %zu\n", needed_space, MHLEN));
 		/*
 		 * Setup new mbuf to have leading space to prepend the
 		 * 802.11 header and any crypto header bits that are
@@ -712,7 +712,7 @@ ieee80211_setup_wpa_ie(struct ieee80211com *ic, u_int8_t *ie)
 	/* calculate element length */
 	ie[1] = frm - ie - 2;
 	KASSERT(ie[1]+2 <= sizeof(struct ieee80211_ie_wpa),
-		("WPA IE too big, %u > %u",
+		("WPA IE too big, %u > %zu",
 		ie[1]+2, sizeof(struct ieee80211_ie_wpa)));
 	return frm;
 #undef ADDSHORT
@@ -796,7 +796,7 @@ ieee80211_setup_rsn_ie(struct ieee80211com *ic, u_int8_t *ie)
 	/* calculate element length */
 	ie[1] = frm - ie - 2;
 	KASSERT(ie[1]+2 <= sizeof(struct ieee80211_ie_wpa),
-		("RSN IE too big, %u > %u",
+		("RSN IE too big, %u > %zu",
 		ie[1]+2, sizeof(struct ieee80211_ie_wpa)));
 	return frm;
 #undef ADDSELECTOR