commit 5d110f0aa69f065ee386ec1840dfee1e8cc46bc1
author Wilson Callan <wcallan@savantav.com> Sat Jul 28 10:56:13 2007 -0400
committer Ben Warren <bwarren@qstreams.com> Mon Aug 13 23:07:53 2007 -0400
tree 58b95ccf36c7929d8848b7ede840daa17585e4b3
parent 50cca8b976ec74069860208c36e64ce8f4d5e4c1

New CONFIG_BOOTP_SERVERIP option

Added CONFIG_BOOTP_SERVERIP to allow the tftp server to be different
from the bootp server

Signed-off-by: Wilson Callan <wcallan@savantav.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>

net/bootp.c

diff --git a/net/bootp.c b/net/bootp.c
index 80f53bc..be1ee33 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -120,10 +120,12 @@
 	IPaddr_t tmp_ip;
 
 	NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
+#if !defined(CONFIG_BOOTP_SERVERIP)
 	NetCopyIP(&tmp_ip, &bp->bp_siaddr);
 	if (tmp_ip != 0)
 		NetCopyIP(&NetServerIP, &bp->bp_siaddr);
 	memcpy (NetServerEther, ((Ethernet_t *)NetRxPkt)->et_src, 6);
+#endif
 	if (strlen(bp->bp_file) > 0)
 		copy_filename (BootFile, bp->bp_file, sizeof(BootFile));