diff options
| author | wdenk <wdenk> | 2003-03-06 13:39:27 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-06 13:39:27 +0000 |
| commit | 47cd00fa707af9de76408b69d3e911717dbbfab1 (patch) | |
| tree | dd887729a4eaf11e7a225563f4c604ef4b7d695b /net/bootp.c | |
| parent | db2f721ffcf9693086a7e5c6c7015f2019e7f52e (diff) | |
| download | olio-uboot-2014.01-47cd00fa707af9de76408b69d3e911717dbbfab1.tar.xz olio-uboot-2014.01-47cd00fa707af9de76408b69d3e911717dbbfab1.zip | |
* 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
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bootp.c b/net/bootp.c index cbce06172..ef8cd605b 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; |