Changeset 32eceb4f in mainline for uspace/srv/net/il/arp/arp.h


Ignore:
Timestamp:
2010-11-20T22:30:36Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb59f787
Parents:
1b22bd4 (diff), 7e1f9b7 (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:
1 edited

Legend:

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

    r1b22bd4 r32eceb4f  
    5555typedef struct arp_device arp_device_t;
    5656
    57 /** Type definition of the ARP device specific data pointer.
    58  * @see arp_device
    59  */
    60 typedef arp_device_t *arp_device_ref;
    61 
    6257/** Type definition of the ARP global data.
    6358 * @see arp_globals
     
    6964 */
    7065typedef struct arp_proto arp_proto_t;
    71 
    72 /** Type definition of the ARP protocol specific data pointer.
    73  * @see arp_proto
    74  */
    75 typedef arp_proto_t *arp_proto_ref;
    7666
    7767/** ARP address map.
     
    9989struct arp_device {
    10090        /** Actual device hardware address. */
    101         measured_string_ref addr;
     91        measured_string_t * addr;
    10292        /** Actual device hardware address data. */
    10393        char *addr_data;
    10494        /** Broadcast device hardware address. */
    105         measured_string_ref broadcast_addr;
     95        measured_string_t * broadcast_addr;
    10696        /** Broadcast device hardware address data. */
    10797        char *broadcast_data;
     
    145135struct arp_proto {
    146136        /** Actual device protocol address. */
    147         measured_string_ref addr;
     137        measured_string_t *addr;
    148138        /** Actual device protocol address data. */
    149139        char *addr_data;
Note: See TracChangeset for help on using the changeset viewer.