Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[u-boot] / net / bootp.h

diff --git a/net/bootp.h b/net/bootp.h
index 8e52aec726d8b2d2838e9a466523b00486890248..320cc3bd3025f12897b91b3016d57321d2378998 100644 (file)
--- 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
@@ -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 3UL     /* Seconds to wait for offers */
 
 /**********************************************************************/