Changeset 00aece0 in mainline for uspace/lib/net/include/tl_common.h


Ignore:
Timestamp:
2012-02-18T16:47:38Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4449c6c
Parents:
bd5f3b7 (diff), f943dd3 (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/lib/net/include/tl_common.h

    rbd5f3b7 r00aece0  
    5252
    5353extern int tl_get_ip_packet_dimension(async_sess_t *, packet_dimensions_t *,
    54     device_id_t, packet_dimension_t **);
     54    nic_device_id_t, packet_dimension_t **);
    5555extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
    56 extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t,
     56extern int tl_update_ip_packet_dimension(packet_dimensions_t *, nic_device_id_t,
    5757    size_t);
    5858extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
Note: See TracChangeset for help on using the changeset viewer.