diff options
| author | Wolfgang Denk <wd@atlas.denx.de> | 2006-10-09 01:26:14 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-10-09 01:26:14 +0200 |
| commit | d82718fed0085b713d223b878c2378aeccc9a3e2 (patch) | |
| tree | dd52d2dc0ae34e23db8ccb170670614b8223ee13 | |
| parent | 1d92b2e550f5c069befe349a294238cee57959a9 (diff) | |
| download | talos-obmc-uboot-d82718fed0085b713d223b878c2378aeccc9a3e2.tar.gz talos-obmc-uboot-d82718fed0085b713d223b878c2378aeccc9a3e2.zip | |
Make bootp implementation RFC3046 compliant
Patch by Joakim Larsson, 27 Jun 2006
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | net/bootp.c | 7 |
2 files changed, 9 insertions, 1 deletions
@@ -2,6 +2,9 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Make bootp implementation RFC3046 compliant + Patch by Joakim Larsson, 27 Jun 2006 + * TQM5200: perform POST memory test only on STK52xx carrier board. (and then only if PSC6_3 is read as "1" when booting). Patch by Martin Krause, 21 Jun 2006 diff --git a/net/bootp.c b/net/bootp.c index 669d74a6a5..8f1382e945 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -851,7 +851,12 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer) NetCopyIP(&bp->bp_ciaddr, &bp_offer->bp_ciaddr); /* both in network byte order */ NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr); NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr); - NetCopyIP(&bp->bp_giaddr, &bp_offer->bp_giaddr); + /* + * RFC3046 requires Relay Agents to discard packets with + * nonzero and offered giaddr + */ + NetWriteIP(&bp->bp_giaddr, 0); + memcpy (bp->bp_chaddr, NetOurEther, 6); /* |
