Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: cosmetic: Rename OPT_SIZE to OPT_FIELD_SIZE

Browse source 
Clearer constant name.
Also remove related BOOTP_SIZE which was unused and doesn't take
into account VLAN packets.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-05-23 07:58:14 +00:00
parent 0b4c5ff4ab
commit f8315731db
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/bootp.c
View file

@ -71,7 +71,7 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
if (dest != PORT_BOOTPC || src != PORT_BOOTPS) if (dest != PORT_BOOTPC || src != PORT_BOOTPS)
retval = -1; retval = -1;
else if (len < sizeof(struct Bootp_t) - OPT_SIZE) else if (len < sizeof(struct Bootp_t) - OPT_FIELD_SIZE)
retval = -2; retval = -2;
else if (bp->bp_op != OP_BOOTREQUEST && else if (bp->bp_op != OP_BOOTREQUEST &&
bp->bp_op != OP_BOOTREPLY && bp->bp_op != OP_BOOTREPLY &&
@ -368,8 +368,8 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID,
*e++ = 57; /* Maximum DHCP Message Size */ *e++ = 57; /* Maximum DHCP Message Size */
*e++ = 2; *e++ = 2;
*e++ = (576 - 312 + OPT_SIZE) >> 8; *e++ = (576 - 312 + OPT_FIELD_SIZE) >> 8;
*e++ = (576 - 312 + OPT_SIZE) & 0xff; *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
if (ServerID) { if (ServerID) {
int tmp = ntohl(ServerID); int tmp = ntohl(ServerID);
@ -519,8 +519,8 @@ static int BootpExtended(u8 *e)
*e++ = 57; /* Maximum DHCP Message Size */ *e++ = 57; /* Maximum DHCP Message Size */
*e++ = 2; *e++ = 2;
*e++ = (576 - 312 + OPT_SIZE) >> 16; *e++ = (576 - 312 + OPT_FIELD_SIZE) >> 16;
*e++ = (576 - 312 + OPT_SIZE) & 0xff; *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
#endif #endif
#if defined(CONFIG_BOOTP_SUBNETMASK) #if defined(CONFIG_BOOTP_SUBNETMASK)

7
net/bootp.h
View file

@ -20,13 +20,13 @@
*/ */
#if defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_DHCP)
/* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */ /* 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) #if defined(CONFIG_BOOTP_VENDOREX)
extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */ 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 */ extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL */
#endif #endif
#else #else
#define OPT_SIZE 64 #define OPT_FIELD_SIZE 64
#endif #endif
struct Bootp_t { struct Bootp_t {
@ -48,11 +48,10 @@ struct Bootp_t {
uchar bp_chaddr[16]; /* Client hardware address */ uchar bp_chaddr[16]; /* Client hardware address */
char bp_sname[64]; /* Server host name */ char bp_sname[64]; /* Server host name */
char bp_file[128]; /* Boot file 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_HDR_SIZE sizeof(struct Bootp_t)
#define BOOTP_SIZE (ETHER_HDR_SIZE + IP_UDP_HDR_SIZE + BOOTP_HDR_SIZE)
/**********************************************************************/ /**********************************************************************/
/* /*