Changeset ef689ef0 in mainline for uspace/lib/net/include


Ignore:
Timestamp:
2010-10-14T22:08:50Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a7a85d16
Parents:
10056483 (diff), f63a591d (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 from lp:~jakub/helenos/net.

Location:
uspace/lib/net/include
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/include/arp_interface.h

    r10056483 ref689ef0  
    3535
    3636#include <adt/measured_strings.h>
    37 #include <net_device.h>
     37#include <task.h>
     38
     39#include <ipc/services.h>
     40
     41#include <net/device.h>
     42#include <net/socket.h>
    3843
    3944/** @name ARP module interface

  • uspace/lib/net/include/icmp_interface.h

    r10056483 ref689ef0  
    3737#include <sys/types.h>
    3838
    39 #include <net_device.h>
     39#include <net/device.h>
    4040#include <adt/measured_strings.h>
    4141#include <net/packet.h>

  • uspace/lib/net/include/il_interface.h

    r10056483 ref689ef0  
    3939#define __NET_IL_INTERFACE_H__
    4040
    41 #include <async.h>
     41#include <generic.h>
    4242
    4343#include <ipc/services.h>
    4444
    45 #include <net_messages.h>
    46 #include <net_device.h>
     45#include <net/device.h>
    4746#include <net/packet.h>
     47#include <il_messages.h>
     48
    4849#include <packet_client.h>
    49 #include <il_messages.h>
    5050
    5151/** @name Internetwork layer module interface

  • uspace/lib/net/include/ip_interface.h

    r10056483 ref689ef0  
    3838#include <ipc/services.h>
    3939
    40 #include <net_device.h>
     40#include <net/device.h>
    4141#include <net/packet.h>
    4242

  • uspace/lib/net/include/ip_remote.h

    r10056483 ref689ef0  
    3434#define __NET_IP_REMOTE_H__
    3535
    36 #include <async.h>
    3736#include <ipc/services.h>
    3837
    … …  
    4039#include <net/inet.h>
    4140#include <net/in.h>
     41#include <net/packet.h>
     42#include <net/device.h>
     43#include <net/socket.h>
    4244
    4345extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);

  • uspace/lib/net/include/net_interface.h

    r10056483 ref689ef0  
    3636#include <ipc/services.h>
    3737
    38 #include <net_device.h>
     38#include <net/device.h>
    3939#include <adt/measured_strings.h>
    4040

  • uspace/lib/net/include/netif_local.h

    r10056483 ref689ef0  
    4646
    4747#include <adt/measured_strings.h>
    48 #include <net_device.h>
     48#include <net/device.h>
    4949#include <net/packet.h>
    5050

  • uspace/lib/net/include/netif_remote.h

    r10056483 ref689ef0  
    3434#define __NET_NETIF_REMOTE_H__
    3535
    36 #include <async.h>
    37 #include <fibril_synch.h>
    38 #include <ipc/ipc.h>
     36#include <ipc/services.h>
     37#include <adt/measured_strings.h>
     38#include <net/device.h>
    3939
    4040extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,

  • uspace/lib/net/include/nil_interface.h

    r10056483 ref689ef0  
    3939#include <ipc/ipc.h>
    4040
    41 #include <net_messages.h>
    42 #include <adt/measured_strings.h>
    43 #include <net/packet.h>
     41#include <generic.h>
    4442#include <nil_messages.h>
    45 #include <net_device.h>
     43#include <nil_remote.h>
    4644
    4745#define nil_bind_service(service, device_id, me, receiver) \
    … …  
    6765            netif_service)
    6866
    69 
    70 #include <nil_remote.h>
    71 #include <packet/packet_server.h>
    72 
    7367#define nil_device_state_msg  nil_device_state_msg_remote
    7468#define nil_received_msg      nil_received_msg_remote

  • uspace/lib/net/include/nil_remote.h

    r10056483 ref689ef0  
    3434#define __NET_NIL_REMOTE_H__
    3535
    36 #include <async.h>
    37 #include <fibril_synch.h>
    38 #include <ipc/ipc.h>
     36#include <ipc/services.h>
     37#include <net/device.h>
     38#include <net/packet.h>
    3939
    4040extern int nil_device_state_msg_remote(int, device_id_t, int);

  • uspace/lib/net/include/socket_core.h

    r10056483 ref689ef0  
    4141
    4242#include <net/in.h>
    43 #include <net_device.h>
     43#include <net/device.h>
    4444#include <adt/generic_char_map.h>
    4545#include <adt/dynamic_fifo.h>

  • uspace/lib/net/include/tl_common.h

    r10056483 ref689ef0  
    4040#include <net/socket_codes.h>
    4141#include <net/packet.h>
    42 #include <net_device.h>
     42#include <net/device.h>
    4343#include <net/inet.h>
    4444

  • uspace/lib/net/include/tl_interface.h

    r10056483 ref689ef0  
    4141#include <ipc/services.h>
    4242
    43 #include <net_messages.h>
    44 #include <net_device.h>
     43#include <generic.h>
     44#include <net/device.h>
    4545#include <net/packet.h>
    4646#include <packet_client.h>
Note: See TracChangeset for help on using the changeset viewer.