net: cosmetic: Replace magic numbers in arp.c with constants

[oweals/u-boot.git] / include / net.h

diff --git a/include/net.h b/include/net.h
index ff66073e6e6360cfbd3d29629ebbdd65882a982b..3bf08063e9091689b3969c4641319143b136b811 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -179,11 +179,11 @@ struct e802_hdr {
        ushort          et_prot;        /* 802 protocol                 */
 };
 
-/* 802 ethernet header size */
+/* 802 + SNAP + ethernet header size */
 #define E802_HDR_SIZE  (sizeof(struct e802_hdr))
 
 /*
- *     Ethernet header
+ *     Virtual LAN Ethernet header
  */
 struct vlan_ethernet_hdr {
        uchar           vet_dest[6];    /* Destination node             */
@@ -259,7 +259,9 @@ struct arp_hdr {
 #   define ARP_ETHER       1           /* Ethernet  hardware address   */
        ushort          ar_pro;         /* Format of protocol address   */
        uchar           ar_hln;         /* Length of hardware address   */
+#   define ARP_HLEN    6
        uchar           ar_pln;         /* Length of protocol address   */
+#   define ARP_PLEN    4
        ushort          ar_op;          /* Operation                    */
 #   define ARPOP_REQUEST    1          /* Request  to resolve  address */
 #   define ARPOP_REPLY     2           /* Response to previous request */
@@ -273,6 +275,10 @@ struct arp_hdr {
         * specific hardware/protocol combinations.
         */
        uchar           ar_data[0];
+#define ar_sha         ar_data[0]
+#define ar_spa         ar_data[ARP_HLEN]
+#define ar_tha         ar_data[ARP_HLEN + ARP_PLEN]
+#define ar_tpa         ar_data[ARP_HLEN + ARP_PLEN + ARP_HLEN]
 #if 0
        uchar           ar_sha[];       /* Sender hardware address      */
        uchar           ar_spa[];       /* Sender protocol address      */