Changeset 7715994 in mainline for uspace/srv/net/il/arp/arp_header.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/net/il/arp/arp_header.h (modified) (1 diff)

uspace/srv/net/il/arp/arp_header.h

@@ -57 +57 @@
          *  @see hardware.h
          */
-        uint16_t        hardware;
+        uint16_t hardware;
         /** Protocol identifier.
          */
-        uint16_t        protocol;
+        uint16_t protocol;
         /** Hardware address length in bytes.
          */
-        uint8_t         hardware_length;
+        uint8_t hardware_length;
         /** Protocol address length in bytes.
          */
-        uint8_t         protocol_length;
+        uint8_t protocol_length;
         /** ARP packet type.
          *  @see arp_oc.h
          */
-        uint16_t        operation;
+        uint16_t operation;
 } __attribute__ ((packed));