X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=net%2Fbootp.h;h=50625abea1839e6ecff7d04c8137a3ab6ca64c32;hb=486cad03be46114d726df56721ee27cba52c38e3;hp=8e52aec726d8b2d2838e9a466523b00486890248;hpb=6e2115acb6a892d53a6881bf253ae41d3df39156;p=u-boot

diff --git a/net/bootp.h b/net/bootp.h
index 8e52aec726..50625abea1 100644
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -18,7 +18,7 @@
 /*
  *	BOOTP header.
  */
-#if (CONFIG_COMMANDS & CFG_CMD_DHCP) || defined(CONFIG_CMD_DHCP)
+#if defined(CONFIG_CMD_DHCP)
 #define OPT_SIZE 312	/* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
 #else
 #define OPT_SIZE 64
@@ -60,7 +60,7 @@ extern ulong	BootpID;		/* ID of cur BOOTP request		*/
 extern char	BootFile[128];		/* Boot file name			*/
 extern int	BootpTry;
 #ifdef CONFIG_BOOTP_RANDOM_DELAY
-ulong		seed1, seed2;		/* seed for random BOOTP delay		*/
+extern ulong	seed1, seed2;		/* seed for random BOOTP delay		*/
 #endif
 
 
@@ -88,7 +88,7 @@ typedef enum { INIT,
 #define DHCP_NAK      6
 #define DHCP_RELEASE  7
 
-#define SELECT_TIMEOUT 3	/* Seconds to wait for offers */
+#define SELECT_TIMEOUT 3000UL	/* Milliseconds to wait for offers */
 
 /**********************************************************************/