diff options
| author | Michael Brown | 2008-11-19 03:22:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:15:44 +0100 |
| commit | b59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch) | |
| tree | 0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/net | |
| parent | [libgcc] Make __libgcc architecture-specific (diff) | |
| download | ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip | |
[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long
This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/tcp.c | 10 | ||||
| -rw-r--r-- | src/net/tcp/iscsi.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tcp.c b/src/net/tcp.c index df87fc14..3a9ab621 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -483,7 +483,7 @@ static int tcp_xmit ( struct tcp_connection *tcp, int force_send ) { tcphdr->csum = tcpip_chksum ( iobuf->data, iob_len ( iobuf ) ); /* Dump header */ - DBGC ( tcp, "TCP %p TX %d->%d %08lx..%08lx %08lx %4zd", + DBGC ( tcp, "TCP %p TX %d->%d %08x..%08x %08x %4zd", tcp, ntohs ( tcphdr->src ), ntohs ( tcphdr->dest ), ntohl ( tcphdr->seq ), ( ntohl ( tcphdr->seq ) + seq_len ), ntohl ( tcphdr->ack ), len ); @@ -564,7 +564,7 @@ static int tcp_xmit_reset ( struct tcp_connection *tcp, tcphdr->csum = tcpip_chksum ( iobuf->data, iob_len ( iobuf ) ); /* Dump header */ - DBGC ( tcp, "TCP %p TX %d->%d %08lx..%08lx %08lx %4d", + DBGC ( tcp, "TCP %p TX %d->%d %08x..%08x %08x %4d", tcp, ntohs ( tcphdr->src ), ntohs ( tcphdr->dest ), ntohl ( tcphdr->seq ), ( ntohl ( tcphdr->seq ) ), ntohl ( tcphdr->ack ), 0 ); @@ -702,8 +702,8 @@ static int tcp_rx_ack ( struct tcp_connection *tcp, uint32_t ack, /* Ignore duplicate or out-of-range ACK */ if ( ack_len > tcp->snd_sent ) { - DBGC ( tcp, "TCP %p received ACK for [%08lx,%08lx), " - "sent only [%08lx,%08lx)\n", tcp, tcp->snd_seq, + DBGC ( tcp, "TCP %p received ACK for [%08x,%08x), " + "sent only [%08x,%08x)\n", tcp, tcp->snd_seq, ( tcp->snd_seq + ack_len ), tcp->snd_seq, ( tcp->snd_seq + tcp->snd_sent ) ); return -EINVAL; @@ -894,7 +894,7 @@ static int tcp_rx ( struct io_buffer *iobuf, len = iob_len ( iobuf ); /* Dump header */ - DBGC ( tcp, "TCP %p RX %d<-%d %08lx %08lx..%08lx %4zd", + DBGC ( tcp, "TCP %p RX %d<-%d %08x %08x..%08x %4zd", tcp, ntohs ( tcphdr->dest ), ntohs ( tcphdr->src ), ntohl ( tcphdr->ack ), ntohl ( tcphdr->seq ), ( ntohl ( tcphdr->seq ) + len + diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c index e9e36449..aa99db71 100644 --- a/src/net/tcp/iscsi.c +++ b/src/net/tcp/iscsi.c @@ -1305,7 +1305,7 @@ static int iscsi_rx_bhs ( struct iscsi_session *iscsi, const void *data, size_t len, size_t remaining __unused ) { memcpy ( &iscsi->rx_bhs.bytes[iscsi->rx_offset], data, len ); if ( ( iscsi->rx_offset + len ) >= sizeof ( iscsi->rx_bhs ) ) { - DBGC2 ( iscsi, "iSCSI %p received PDU opcode %#x len %#lx\n", + DBGC2 ( iscsi, "iSCSI %p received PDU opcode %#x len %#x\n", iscsi, iscsi->rx_bhs.common.opcode, ISCSI_DATA_LEN ( iscsi->rx_bhs.common.lengths ) ); } |