diff options
| author | Piotr Jaroszyński | 2010-03-30 15:33:20 +0200 |
|---|---|---|
| committer | Michael Brown | 2010-05-27 11:23:06 +0200 |
| commit | 7c6d3752c966758b0fb369d73bae59909aaa9ec1 (patch) | |
| tree | 50dcb0312a5c9430445413d09f5ac6e6f68829f7 /src/net/80211 | |
| parent | [dhcp] Don't consider invalid offers to be duplicates (diff) | |
| download | ipxe-7c6d3752c966758b0fb369d73bae59909aaa9ec1.tar.gz ipxe-7c6d3752c966758b0fb369d73bae59909aaa9ec1.tar.xz ipxe-7c6d3752c966758b0fb369d73bae59909aaa9ec1.zip | |
[compiler] Fix 64bit compile time errors
Apart from format specifier fixes there are two changes in proper code:
- Change type of regs in skge_hw to unsigned long
- Cast result of sizeof in myri10ge to uint32_t
Both don't change anything for i386 and should be fine on x86_64.
Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Joshua Oreman <oremanj@rwcr.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/80211')
| -rw-r--r-- | src/net/80211/wpa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/80211/wpa.c b/src/net/80211/wpa.c index 132d14ca..b676c63f 100644 --- a/src/net/80211/wpa.c +++ b/src/net/80211/wpa.c @@ -383,7 +383,7 @@ static int wpa_maybe_install_gtk ( struct wpa_common_ctx *ctx, return -ENOENT; if ( ie->len - 6u > sizeof ( ctx->gtk.tk ) ) { - DBGC ( ctx, "WPA %p: GTK KDE is too long (%d bytes, max %d)\n", + DBGC ( ctx, "WPA %p: GTK KDE is too long (%d bytes, max %zd)\n", ctx, ie->len - 4, sizeof ( ctx->gtk.tk ) ); return -EINVAL; } @@ -737,7 +737,7 @@ static int wpa_handle_1_of_2 ( struct wpa_common_ctx *ctx, return rc; /* non-fatal */ } if ( pkt->datalen > sizeof ( ctx->gtk.tk ) ) { - DBGC ( ctx, "WPA %p: too much GTK data (%d > %d)\n", + DBGC ( ctx, "WPA %p: too much GTK data (%d > %zd)\n", ctx, pkt->datalen, sizeof ( ctx->gtk.tk ) ); return wpa_fail ( ctx, -EINVAL ); } @@ -813,7 +813,7 @@ static int eapol_key_rx ( struct io_buffer *iob, struct net_device *netdev, } if ( ( void * ) ( pkt + 1 ) + ntohs ( pkt->datalen ) > iob->tail ) { - DBGC ( ctx, "WPA %p: packet truncated (has %d extra bytes, " + DBGC ( ctx, "WPA %p: packet truncated (has %zd extra bytes, " "states %d)\n", ctx, iob->tail - ( void * ) ( pkt + 1 ), ntohs ( pkt->datalen ) ); rc = -EINVAL; |