summaryrefslogtreecommitdiffstats
path: root/commands/net.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-04-07 11:40:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2008-04-07 11:40:19 +0200
commit59fd84bd7f3e7ba99553d4ca7adc223a1a87ccfc (patch)
tree2acb293d1d32e8dae5ca3933864a98ff79deef24 /commands/net.c
parent9bf7a4f97f58951507904f1d2ce7a469060deaae (diff)
downloadbarebox-59fd84bd7f3e7ba99553d4ca7adc223a1a87ccfc.tar.gz
barebox-59fd84bd7f3e7ba99553d4ca7adc223a1a87ccfc.tar.xz
[net]: remove CONFIG_BOOTP_MASK
Diffstat (limited to 'commands/net.c')
-rw-r--r--commands/net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/commands/net.c b/commands/net.c
index 629f690096..e4257a7b0f 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -66,7 +66,7 @@ static void netboot_update_env (void)
ip_to_string (NetOurDNSIP, tmp);
setenv ("dnsip", tmp);
}
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
+#ifdef CONFIG_BOOTP_DNS2
if (NetOurDNS2IP) {
ip_to_string (NetOurDNS2IP, tmp);
setenv ("dnsip2", tmp);
@@ -75,13 +75,13 @@ static void netboot_update_env (void)
if (NetOurNISDomain[0])
setenv ("domain", NetOurNISDomain);
-#if defined CONFIG_NET_SNTP && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
+#if defined CONFIG_NET_SNTP && defined CONFIG_BOOTP_TIMEOFFSET
if (NetTimeOffset) {
sprintf (tmp, "%d", NetTimeOffset);
setenv ("timeoffset", tmp);
}
#endif
-#if defined CONFIG_NET_SNTP && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
+#if defined CONFIG_NET_SNTP && defined CONFIG_BOOTP_NTPSERVER
if (NetNtpServerIP) {
ip_to_string (NetNtpServerIP, tmp);
setenv ("ntpserverip", tmp);