summaryrefslogtreecommitdiff
path: root/net/bootp.h
diff options
context:
space:
mode:
authorSergey Temerkhanov <s.temerkhanov@gmail.com>2015-04-08 01:41:23 -0500
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:35 -0600
commit717234e00249960df3a252c9188fc0abe9d8f4e3 (patch)
tree742a1c7564771c9992b4a11250e8ef704b2dd626 /net/bootp.h
parent5917e7d165d4a66d724631c196cf307485769821 (diff)
downloadu-boot-717234e00249960df3a252c9188fc0abe9d8f4e3.tar.gz
u-boot-717234e00249960df3a252c9188fc0abe9d8f4e3.tar.bz2
u-boot-717234e00249960df3a252c9188fc0abe9d8f4e3.zip
net: Convert protocol structures to use explicit sizes
Convert uchar/ushort to u8/u16 respectively. Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com> Signed-off-by: Sergey Temerkhanov <s.temerkhanov@gmail.com> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net/bootp.h')
-rw-r--r--net/bootp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/bootp.h b/net/bootp.h
index 1a5928671a..fcb0a64e61 100644
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -30,22 +30,22 @@ extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL */
#endif
struct bootp_hdr {
- uchar bp_op; /* Operation */
+ u8 bp_op; /* Operation */
# define OP_BOOTREQUEST 1
# define OP_BOOTREPLY 2
- uchar bp_htype; /* Hardware type */
+ u8 bp_htype; /* Hardware type */
# define HWT_ETHER 1
- uchar bp_hlen; /* Hardware address length */
+ u8 bp_hlen; /* Hardware address length */
# define HWL_ETHER 6
- uchar bp_hops; /* Hop count (gateway thing) */
+ u8 bp_hops; /* Hop count (gateway thing) */
u32 bp_id; /* Transaction ID */
- ushort bp_secs; /* Seconds since boot */
- ushort bp_spare1; /* Alignment */
+ u16 bp_secs; /* Seconds since boot */
+ u16 bp_spare1; /* Alignment */
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 */
+ u8 bp_chaddr[16]; /* Client hardware address */
char bp_sname[64]; /* Server host name */
char bp_file[128]; /* Boot file name */
char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */