X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=net%2Fbootp.h;h=ecbcc4d5093c3dd4b2ba5e4b89e200bd32fe22d8;hb=0cb3325cd3a2f574c0ab73ab83b892c27cacab74;hp=1cf9a02b24bc1a2fc2d14b999d27beeb81d9f1ce;hpb=594c26f8a7dbb83243a5168378a2164fa08d6dd8;p=u-boot diff --git a/net/bootp.h b/net/bootp.h index 1cf9a02b24..ecbcc4d509 100644 --- 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 { @@ -48,11 +48,10 @@ struct Bootp_t { 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_UDP_HDR_SIZE + BOOTP_HDR_SIZE) /**********************************************************************/ /*