From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 23 May 2012 07:59:17 +0000 (+0000)
Subject: net: Don't write the "serverip" env var if configured not to
X-Git-Tag: v2012.07-rc1~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a3e1a727fe8a8b0294fe3ffbc8dcd2f14a4e5a4e;p=u-boot

net: Don't write the "serverip" env var if configured not to

Before this patch, bootp would not overwrite the value, but the
value was still clobbered in the env

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 65f32bceef..2f660566f7 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -153,12 +153,16 @@ static void netboot_update_env (void)
 		ip_to_string (NetOurIP, tmp);
 		setenv ("ipaddr", tmp);
 	}
-
+#if !defined(CONFIG_BOOTP_SERVERIP)
+	/*
+	 * Only attempt to change serverip if net/bootp.c:BootpCopyNetParams()
+	 * could have set it
+	 */
 	if (NetServerIP) {
 		ip_to_string (NetServerIP, tmp);
 		setenv ("serverip", tmp);
 	}
-
+#endif
 	if (NetOurDNSIP) {
 		ip_to_string (NetOurDNSIP, tmp);
 		setenv ("dnsip", tmp);