From 47cd00fa707af9de76408b69d3e911717dbbfab1 Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 6 Mar 2003 13:39:27 +0000 Subject: * Patches by Robert Schwebel, 06 Mar 2003: - fix bug in BOOTP code (must use NetCopyIP) - update of CSB226 port - clear BSS segment on XScale - added support for i2c_init_board() function - update to the Innokom plattform * Extend support for redundand environments for configurations where environment size < sector size --- net/bootp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/bootp.c b/net/bootp.c index cbce061722..ef8cd605b5 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -211,7 +211,7 @@ static void BootpVendorFieldProcess(u8 *ext) break; case 18: /* Extension path - Not yet supported */ /* - * This can be used to send the informations of the + * This can be used to send the information of the * vendor area in another file that the client can * access via TFTP. */ @@ -229,7 +229,7 @@ static void BootpVendorFieldProcess(u8 *ext) /* Application layer fields */ case 43: /* Vendor specific info - Not yet supported */ /* - * Binary informations to exchange specific + * Binary information to exchange specific * product information. */ break; @@ -752,6 +752,7 @@ void DhcpSendRequestPkt(Bootp_t *bp_offer) volatile uchar *pkt, *iphdr; Bootp_t *bp; int pktlen, iplen, extlen; + IPaddr_t OfferedIP; debug ("DhcpSendRequestPkt: Sending DHCPREQUEST\n"); pkt = NetTxPacket; @@ -784,7 +785,8 @@ void DhcpSendRequestPkt(Bootp_t *bp_offer) /* * Copy options from OFFER packet if present */ - extlen = DhcpExtended(bp->bp_vend, DHCP_REQUEST, NetServerIP, bp->bp_yiaddr); + NetCopyIP(&OfferedIP, &bp->bp_yiaddr); + extlen = DhcpExtended(bp->bp_vend, DHCP_REQUEST, NetServerIP, OfferedIP); pktlen = BOOTP_SIZE - sizeof(bp->bp_vend) + extlen; iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + extlen; -- cgit v1.2.1