[U-Boot] [PATCH v2 18/21] net: cosmetic: Rename OPT_SIZE to OPT_FIELD_SIZE

[Simon Glass]

Hi Joe,

On Wed, Mar 28, 2012 at 12:42 PM, Joe Hershberger <joe.hershberger at ni.com>wrote:

> 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 at ni.com>
> Cc: Joe Hershberger <joe.hershberger at gmail.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Mike Frysinger <vapier at gentoo.org>
> ---
> Changes for v2:
>   - Split from "Improve variable names and code readability"
>
>  net/bootp.c |   10 +++++-----
>  net/bootp.h |    7 +++----
>  2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/net/bootp.c b/net/bootp.c
> index 44c0b5c..62d3c71 100644
> --- a/net/bootp.c
> +++ b/net/bootp.c
> @@ -73,7 +73,7 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest,
> unsigned src, unsigned len)
>
>        if (dest != PORT_BOOTPC || src != PORT_BOOTPS)
>                retval = -1;
> -       else if (len < sizeof(struct Bootp_t) - OPT_SIZE)
> +       else if (len < sizeof(struct Bootp_t) - OPT_FIELD_SIZE)
>                retval = -2;
>        else if (bp->bp_op != OP_BOOTREQUEST &&
>                        bp->bp_op != OP_BOOTREPLY &&
> @@ -370,8 +370,8 @@ static int DhcpExtended(u8 *e, int message_type,
> IPaddr_t ServerID,
>
>        *e++ = 57;              /* Maximum DHCP Message Size */
>        *e++ = 2;
> -       *e++ = (576 - 312 + OPT_SIZE) >> 8;
> -       *e++ = (576 - 312 + OPT_SIZE) & 0xff;
> +       *e++ = (576 - 312 + OPT_FIELD_SIZE) >> 8;
> +       *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
>

Better to use a temporary variable here, and below?


>
>        if (ServerID) {
>                int tmp = ntohl(ServerID);
> @@ -521,8 +521,8 @@ static int BootpExtended(u8 *e)
>
>        *e++ = 57;              /* Maximum DHCP Message Size */
>        *e++ = 2;
> -       *e++ = (576 - 312 + OPT_SIZE) >> 16;
> -       *e++ = (576 - 312 + OPT_SIZE) & 0xff;
> +       *e++ = (576 - 312 + OPT_FIELD_SIZE) >> 16;
> +       *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
>  #endif
>
>  #if defined(CONFIG_BOOTP_SUBNETMASK)
> diff --git a/net/bootp.h b/net/bootp.h
> index 1cf9a02..ecbcc4d 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)
>
>  /**********************************************************************/
>  /*
> --
> 1.6.0.2
>
> Regards,
Simon