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


Ignore:
Timestamp:
2010-03-07T22:51:38Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60ab6c3
Parents:
b5cbff4 (diff), 31c80a5 (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 from lp:~lukasmejdrech/helenos/network.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/il/arp/arp_header.h

    rb5cbff4 r71b00dcc  
    5757         *  @see hardware.h
    5858         */
    59         uint16_t        hardware;
     59        uint16_t hardware;
    6060        /** Protocol identifier.
    6161         */
    62         uint16_t        protocol;
     62        uint16_t protocol;
    6363        /** Hardware address length in bytes.
    6464         */
    65         uint8_t         hardware_length;
     65        uint8_t hardware_length;
    6666        /** Protocol address length in bytes.
    6767         */
    68         uint8_t         protocol_length;
     68        uint8_t protocol_length;
    6969        /** ARP packet type.
    7070         *  @see arp_oc.h
    7171         */
    72         uint16_t        operation;
     72        uint16_t operation;
    7373} __attribute__ ((packed));
    7474
Note: See TracChangeset for help on using the changeset viewer.