From ea45cb0adcf4baa8f939fea4c848f3e1906f19d9 Mon Sep 17 00:00:00 2001 From: Matthias Weisser Date: Sat, 3 Dec 2011 03:29:44 +0000 Subject: net: Make sure IPaddr_t is 32 bits in size When building u-boot as 64 bit application (e.g. sandbox) ulong might be 64 bits in size. This breaks network code as IPaddr_t is 64 bytes in size then and an IPv4 address is 32 bits in size. This patch makes sure that IPaddr_t is always 32 bits in size. Also some warnings introduced by this patch are fixed. Signed-off-by: Matthias Weisser Acked-by: Mike Frysinger --- net/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/net.c') diff --git a/net/net.c b/net/net.c index d0fe1c4..045405b 100644 --- a/net/net.c +++ b/net/net.c @@ -728,7 +728,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) */ if (memcmp(ether, NetEtherNullAddr, 6) == 0) { - debug("sending ARP for %08lx\n", dest); + debug("sending ARP for %08x\n", dest); NetArpWaitPacketIP = dest; NetArpWaitPacketMAC = ether; @@ -751,7 +751,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) return 1; /* waiting */ } - debug("sending UDP to %08lx/%pM\n", dest, ether); + debug("sending UDP to %08x/%pM\n", dest, ether); pkt = (uchar *)NetTxPacket; pkt += NetSetEther(pkt, ether, PROT_IP); @@ -775,7 +775,7 @@ int PingSend(void) memcpy(mac, NetEtherNullAddr, 6); - debug("sending ARP for %08lx\n", NetPingIP); + debug("sending ARP for %08x\n", NetPingIP); NetArpWaitPacketIP = NetPingIP; NetArpWaitPacketMAC = mac; -- cgit v1.1