Ignore:
Timestamp:
2010-11-25T13:42:50Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8df8415
Parents:
a93d79a (diff), eb667613 (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/netif_remote.h

    ra93d79a r8fb1bf82  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_NETIF_REMOTE_H__
    34 #define __NET_NETIF_REMOTE_H__
     33#ifndef LIBNET_NETIF_REMOTE_H_
     34#define LIBNET_NETIF_REMOTE_H_
    3535
     36#include <async.h>
    3637#include <ipc/services.h>
    3738#include <adt/measured_strings.h>
     39
    3840#include <net/device.h>
     41#include <net/packet.h>
    3942
    40 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
     43extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
    4144    char **);
    4245extern int netif_probe_req_remote(int, device_id_t, int, int);
    43 extern int netif_send_msg_remote(int, device_id_t, packet_t, services_t);
     46extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t);
    4447extern int netif_start_req_remote(int, device_id_t);
    4548extern int netif_stop_req_remote(int, device_id_t);
    46 extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
     49extern int netif_stats_req_remote(int, device_id_t, device_stats_t *);
    4750extern int netif_bind_service_remote(services_t, device_id_t, services_t,
    4851    async_client_conn_t);
Note: See TracChangeset for help on using the changeset viewer.