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/drivers/net/myri10ge.c | |
| 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/drivers/net/myri10ge.c')
| -rw-r--r-- | src/drivers/net/myri10ge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/myri10ge.c b/src/drivers/net/myri10ge.c index 65df5e29..2237c484 100644 --- a/src/drivers/net/myri10ge.c +++ b/src/drivers/net/myri10ge.c @@ -723,7 +723,7 @@ static int myri10ge_net_open ( struct net_device *netdev ) /* Set the interrupt queue size. */ - data[0] = ( sizeof ( priv->dma->receive_completion ) + data[0] = ( (uint32_t)( sizeof ( priv->dma->receive_completion ) ) | MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK ); TRY ( CMD_SET_ , INTRQ_SIZE , ); @@ -973,7 +973,7 @@ static int myri10ge_net_transmit ( struct net_device *netdev, return -ENOBUFS; } - DBG2 ( "TX %p+%d ", iobuf->data, iob_len ( iobuf ) ); + DBG2 ( "TX %p+%zd ", iobuf->data, iob_len ( iobuf ) ); DBG2_HD ( iobuf->data, 14 ); /* Record the packet being transmitted, so we can later report |