Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Make sure IPaddr_t is 32 bits in size

Browse source 
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 <weisserm@arcor.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Matthias Weisser 2011-12-03 03:29:44 +00:00 • committed by Wolfgang Denk
parent 7f79c6f2f4
commit ea45cb0adc
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/net.h
View file

@ -33,7 +33,8 @@
#define PKTALIGN 32 #define PKTALIGN 32
typedef ulong IPaddr_t; /* IPv4 addresses are always 32 bits in size */
typedef u32 IPaddr_t;
/** /**

6
net/net.c
View file

@ -728,7 +728,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len)
*/ */
if (memcmp(ether, NetEtherNullAddr, 6) == 0) { if (memcmp(ether, NetEtherNullAddr, 6) == 0) {
debug("sending ARP for %08lx\n", dest); debug("sending ARP for %08x\n", dest);
NetArpWaitPacketIP = dest; NetArpWaitPacketIP = dest;
NetArpWaitPacketMAC = ether; NetArpWaitPacketMAC = ether;
@ -751,7 +751,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len)
return 1; /* waiting */ 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 = (uchar *)NetTxPacket;
pkt += NetSetEther(pkt, ether, PROT_IP); pkt += NetSetEther(pkt, ether, PROT_IP);
@ -775,7 +775,7 @@ int PingSend(void)
memcpy(mac, NetEtherNullAddr, 6); memcpy(mac, NetEtherNullAddr, 6);
debug("sending ARP for %08lx\n", NetPingIP); debug("sending ARP for %08x\n", NetPingIP);
NetArpWaitPacketIP = NetPingIP; NetArpWaitPacketIP = NetPingIP;
NetArpWaitPacketMAC = mac; NetArpWaitPacketMAC = mac;

2
net/nfs.c
View file

@ -688,7 +688,7 @@ NfsStart (void)
} }
if (BootFile[0] == '\0') { if (BootFile[0] == '\0') {
sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img", sprintf(default_filename, "/nfsroot/%02X%02X%02X%02X.img",
NetOurIP & 0xFF, NetOurIP & 0xFF,
(NetOurIP >> 8) & 0xFF, (NetOurIP >> 8) & 0xFF,
(NetOurIP >> 16) & 0xFF, (NetOurIP >> 16) & 0xFF,

2
net/tftp.c
View file

@ -708,7 +708,7 @@ void TftpStart(enum proto_t protocol)
TftpRemoteIP = NetServerIP; TftpRemoteIP = NetServerIP;
if (BootFile[0] == '\0') { if (BootFile[0] == '\0') {
sprintf(default_filename, "%02lX%02lX%02lX%02lX.img", sprintf(default_filename, "%02X%02X%02X%02X.img",
NetOurIP & 0xFF, NetOurIP & 0xFF,
(NetOurIP >> 8) & 0xFF, (NetOurIP >> 8) & 0xFF,
(NetOurIP >> 16) & 0xFF, (NetOurIP >> 16) & 0xFF,