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


Ignore:
Timestamp:
2011-07-08T17:01:01Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc1a727
Parents:
4e36219 (diff), 026793d (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

    r4e36219 rc028b22  
    3838#define NET_ARP_H_
    3939
     40#include <async.h>
    4041#include <fibril_synch.h>
    4142#include <ipc/services.h>
     
    104105        /** Packet dimension. */
    105106        packet_dimension_t packet_dimension;
    106         /** Device module phone. */
    107         int phone;
     107        /** Device module session. */
     108        async_sess_t *sess;
    108109       
    109110        /**
     
    122123        arp_cache_t cache;
    123124       
    124         /** Networking module phone. */
    125         int net_phone;
     125        /** Networking module session. */
     126        async_sess_t *net_sess;
     127       
    126128        /** Safety lock. */
    127129        fibril_mutex_t lock;
Note: See TracChangeset for help on using the changeset viewer.