Mercurial > flash_v2

diff packages/redboot/current/src/net/net_io.c @ 174:38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
author: jlarmour
date: Sun, 29 Jul 2001 02:00:07 +0000
parents: 547dc35af910
children: 4c750ce71ae3
--- a/packages/redboot/current/src/net/net_io.c
+++ b/packages/redboot/current/src/net/net_io.c
@@ -543,6 +543,7 @@ net_init(void)
     flash_get_config("net_debug", &net_debug, CONFIG_BOOL);
     flash_get_config("gdb_port", &gdb_port, CONFIG_INT);
     flash_get_config("bootp", &use_bootp, CONFIG_BOOL);
+    if (!use_bootp)
     {
         ip_addr_t bootp_my_ip;
         char i;
@@ -553,8 +554,9 @@ net_init(void)
             for (i=0; i<4; i++)
                 __local_ip_addr[i] = bootp_my_ip[i];
         }        
+        flash_get_config("bootp_server_ip", &my_bootp_info.bp_siaddr,
+                         CONFIG_IP);
     }
-    flash_get_config("bootp_server_ip", &my_bootp_info.bp_siaddr, CONFIG_IP);
 #endif
     have_net = false;
     // Make sure the recv buffers are set up