net: Convert protocol structures to use explicit sizes

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

diff --git a/net/bootp.h b/net/bootp.h
index 1a5928671a4190bd60394f6c3944e8f5d38d5e8d..fcb0a64e6143c550e101e0fd7597a56804e1ef32 100644 (file)
--- 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  */