summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-10-12 11:29:33 -0500
committerJon Loeliger <jdl@freescale.com>2006-10-12 11:29:33 -0500
commitf7b190d3120611d9d47c3ea784c10f5f713655f5 (patch)
tree7b2ebba6cde3c4fd4e024516296d63f214ff9464 /net
parent0ee90cb77e01d6e8ccd37e1bd96678597875c391 (diff)
parent87621bc24789e024c62a8a12bebd592943cdfb02 (diff)
downloadu-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.zip
u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.gz
u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.bz2
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c
index 8f1382e..1de9a8f 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -851,7 +851,7 @@ 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);
- /*
+ /*
* RFC3046 requires Relay Agents to discard packets with
* nonzero and offered giaddr
*/