net: cosmetic: Change IPaddr_t to struct in_addr

[karo-tx-uboot.git] / net / bootp.h

diff --git a/net/bootp.h b/net/bootp.h
index ce7373454eedd9ec1f82bb3e0586d38a8e90a4e2..8c591a6d5ba3705c0eedcd39caa2b407d703bf76 100644 (file)
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -20,13 +20,13 @@
  */
 #if defined(CONFIG_CMD_DHCP)
 /* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
-#define OPT_SIZE 312
+#define OPT_FIELD_SIZE 312
 #if defined(CONFIG_BOOTP_VENDOREX)
 extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */
 extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
 #endif
 #else
-#define OPT_SIZE 64
+#define OPT_FIELD_SIZE 64
 #endif
 
 struct Bootp_t {
@@ -41,18 +41,17 @@ struct Bootp_t {
        ulong           bp_id;          /* Transaction ID               */
        ushort          bp_secs;        /* Seconds since boot           */
        ushort          bp_spare1;      /* Alignment                    */
-       IPaddr_t        bp_ciaddr;      /* Client IP address            */
-       IPaddr_t        bp_yiaddr;      /* Your (client) IP address     */
-       IPaddr_t        bp_siaddr;      /* Server IP address            */
-       IPaddr_t        bp_giaddr;      /* Gateway IP address           */
+       struct in_addr  bp_ciaddr;      /* Client IP address            */
+       struct in_addr  bp_yiaddr;      /* Your (client) IP address     */
+       struct in_addr  bp_siaddr;      /* Server IP address            */
+       struct in_addr  bp_giaddr;      /* Gateway IP address           */
        uchar           bp_chaddr[16];  /* Client hardware address      */
        char            bp_sname[64];   /* Server host name             */
        char            bp_file[128];   /* Boot file name               */
-       char            bp_vend[OPT_SIZE];      /* Vendor information   */
+       char            bp_vend[OPT_FIELD_SIZE]; /* Vendor information  */
 };
 
 #define BOOTP_HDR_SIZE sizeof(struct Bootp_t)
-#define BOOTP_SIZE     (ETHER_HDR_SIZE + IP_HDR_SIZE + BOOTP_HDR_SIZE)
 
 /**********************************************************************/
 /*
@@ -61,14 +60,11 @@ struct Bootp_t {
 
 /* bootp.c */
 extern ulong   BootpID;                /* ID of cur BOOTP request      */
-extern char    BootFile[128];          /* Boot file name               */
 extern int     BootpTry;
-#ifdef CONFIG_BOOTP_RANDOM_DELAY
-extern ulong   seed1, seed2;           /* seed for random BOOTP delay  */
-#endif
 
 
 /* Send a BOOTP request */
+extern void BootpReset(void);
 extern void BootpRequest(void);
 
 /****************** DHCP Support *********************/
@@ -92,8 +88,6 @@ typedef enum { INIT,
 #define DHCP_NAK      6
 #define DHCP_RELEASE  7
 
-#define SELECT_TIMEOUT 3000UL  /* Milliseconds to wait for offers */
-
 /**********************************************************************/
 
 #endif /* __BOOTP_H__ */