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


Ignore:
Timestamp:
2011-10-08T13:08:53Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bf08ff0
Parents:
8367d1d (diff), 80099c19 (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

    r8367d1d rd7ff048  
    8484 *
    8585 */
    86 int arp_clear_address_req(async_sess_t *sess, device_id_t device_id,
     86int arp_clear_address_req(async_sess_t *sess, nic_device_id_t device_id,
    8787    services_t protocol, measured_string_t *address)
    8888{
    … …  
    108108 *
    109109 */
    110 int arp_clear_device_req(async_sess_t *sess, device_id_t device_id)
     110int arp_clear_device_req(async_sess_t *sess, nic_device_id_t device_id)
    111111{
    112112        async_exch_t *exch = async_exchange_begin(sess);
    … …  
    143143 *
    144144 */
    145 int arp_device_req(async_sess_t *sess, device_id_t device_id,
     145int arp_device_req(async_sess_t *sess, nic_device_id_t device_id,
    146146    services_t protocol, services_t netif, measured_string_t *address)
    147147{
    … …  
    177177 *
    178178 */
    179 int arp_translate_req(async_sess_t *sess, device_id_t device_id,
     179int arp_translate_req(async_sess_t *sess, nic_device_id_t device_id,
    180180    services_t protocol, measured_string_t *address,
    181181    measured_string_t **translation, uint8_t **data)
Note: See TracChangeset for help on using the changeset viewer.