Changeset ad7a6c9 in mainline for uspace/lib/net/il/arp_remote.c


Ignore:
Timestamp:
2011-03-30T13:10:24Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4ae90f9
Parents:
6e50466 (diff), d6b81941 (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/il/arp_remote.c

    r6e50466 rad7a6c9  
    4141#include <async.h>
    4242#include <errno.h>
    43 #include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544#include <ipc/arp.h>
     
    165164int
    166165arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
    167     measured_string_t *address, measured_string_t **translation, char **data)
     166    measured_string_t *address, measured_string_t **translation, uint8_t **data)
    168167{
    169168        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,
Note: See TracChangeset for help on using the changeset viewer.