Ignore:
Timestamp:
2012-04-07T17:41:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b6913b7
Parents:
b69e4c0 (diff), 6bb169b5 (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/arp_interface.h

    rb69e4c0 rdb96017  
    4646/*@{*/
    4747
    48 extern int arp_device_req(async_sess_t *, device_id_t, services_t, services_t,
     48extern int arp_device_req(async_sess_t *, nic_device_id_t, services_t, services_t,
    4949    measured_string_t *);
    50 extern int arp_translate_req(async_sess_t *, device_id_t, services_t,
     50extern int arp_translate_req(async_sess_t *, nic_device_id_t, services_t,
    5151    measured_string_t *, measured_string_t **, uint8_t **);
    52 extern int arp_clear_device_req(async_sess_t *, device_id_t);
    53 extern int arp_clear_address_req(async_sess_t *, device_id_t, services_t,
     52extern int arp_clear_device_req(async_sess_t *, nic_device_id_t);
     53extern int arp_clear_address_req(async_sess_t *, nic_device_id_t, services_t,
    5454    measured_string_t *);
    5555extern int arp_clean_cache_req(async_sess_t *);
Note: See TracChangeset for help on using the changeset viewer.