Ignore:
Timestamp:
2011-07-08T17:01:01Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc1a727
Parents:
4e36219 (diff), 026793d (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/ip_interface.h

    r4e36219 rc028b22  
    3535
    3636#include <net/socket_codes.h>
    37 #include <async.h>
    3837#include <ipc/services.h>
    39 
    4038#include <net/device.h>
    4139#include <net/packet.h>
    42 
    4340#include <net/in.h>
    4441#include <net/ip_codes.h>
    45 
    4642#include <ip_remote.h>
     43#include <async.h>
    4744
    4845#define ip_received_error_msg  ip_received_error_msg_remote
     
    6158/** The transport layer notification function type definition.
    6259 *
    63  * Notifies the transport layer modules about the received packet/s.
     60 * Notify the transport layer modules about the received packet/s.
    6461 *
    65  * @param[in] device_id The device identifier.
    66  * @param[in] packet    The received packet or the received packet queue.
    67  * @param[in] receiver  The receiving module service.
    68  * @param[in] error     The packet error reporting service. Prefixes the
    69  *                      received packet.
    70  * @return              EOK on success.
     62 * @param[in] device_id Device identifier.
     63 * @param[in] packet    Received packet or the received packet queue.
     64 * @param[in] receiver  Receiving module service.
     65 * @param[in] error     Packet error reporting service. Prefixes the
     66 *                      received packet.
     67 *
     68 * @return EOK on success.
     69 *
    7170 */
    7271typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet,
    7372    services_t receiver, services_t error);
    7473
    75 extern int ip_bind_service(services_t, int, services_t, async_client_conn_t);
    76 extern int ip_connect_module(services_t);
     74extern async_sess_t *ip_bind_service(services_t, int, services_t, async_client_conn_t);
     75extern async_sess_t *ip_connect_module(services_t);
    7776
    7877/*@}*/
Note: See TracChangeset for help on using the changeset viewer.