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


Ignore:
Timestamp:
2010-10-08T21:47:40Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b278b4e
Parents:
c0e74b1 (diff), 368fb2c (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:
11 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    rc0e74b1 rae972834  
    3939
    4040#include <icmp_codes.h>
    41 #include <packet/packet.h>
     41#include <net/packet.h>
    4242
    4343/** Processes the received packet prefixed with an ICMP header.

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

    rc0e74b1 rae972834  
    3939#include <net_device.h>
    4040#include <adt/measured_strings.h>
    41 #include <packet/packet.h>
     41#include <net/packet.h>
    4242#include <net/inet.h>
    4343#include <ip_codes.h>

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

    rc0e74b1 rae972834  
    4545#include <net_messages.h>
    4646#include <net_device.h>
    47 #include <packet/packet.h>
    48 #include <packet/packet_client.h>
     47#include <net/packet.h>
     48#include <packet_client.h>
    4949#include <il_messages.h>
    5050

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

    rc0e74b1 rae972834  
    4141#include <sys/types.h>
    4242
    43 #include <packet/packet.h>
     43#include <net/packet.h>
    4444#include <ip_codes.h>
    4545#include <ip_interface.h>

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

    rc0e74b1 rae972834  
    3939
    4040#include <net_device.h>
    41 #include <packet/packet.h>
     41#include <net/packet.h>
    4242
    4343#include <net/in.h>

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

    rc0e74b1 rae972834  
    5353
    5454#include <netif_remote.h>
    55 #include <packet/packet_client.h>
     55#include <packet_client.h>
    5656
    5757#define netif_module_message    netif_module_message_standalone

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

    rc0e74b1 rae972834  
    4848#include <adt/measured_strings.h>
    4949#include <net_device.h>
    50 #include <packet/packet.h>
     50#include <net/packet.h>
    5151
    5252/** Network interface device specific data.

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

    rc0e74b1 rae972834  
    4141#include <net_messages.h>
    4242#include <adt/measured_strings.h>
    43 #include <packet/packet.h>
     43#include <net/packet.h>
    4444#include <nil_messages.h>
    4545#include <net_device.h>

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

    rc0e74b1 rae972834  
    4545#define __NET_PACKET_CLIENT_H__
    4646
    47 #include <packet/packet.h>
     47#include <net/packet.h>
    4848
    4949/** @name Packet client interface
    … …  
    172172 *  @returns Other error codes as defined for the packet_return() function.
    173173 */
    174 extern int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id);
     174extern int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id);
    175175
    176176/** Obtains the packet of the given dimensions.
    … …  
    184184 *  @returns NULL on error.
    185185 */
    186 extern packet_t packet_get_4_local(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix);
     186extern packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix);
    187187
    188188/** Obtains the packet of the given content size.
    … …  
    193193 *  @returns NULL on error.
    194194 */
    195 extern packet_t packet_get_1_local(int phone, size_t content);
     195extern packet_t packet_get_1_remote(int phone, size_t content);
    196196
    197197/** Releases the packet queue.
    … …  
    202202 *  @param[in] packet_id The packet identifier.
    203203 */
    204 extern void pq_release_local(int phone, packet_id_t packet_id);
     204extern void pq_release_remote(int phone, packet_id_t packet_id);
    205205
    206206/** Returns the packet copy.

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

    rc0e74b1 rae972834  
    3434#define __NET_PACKET_REMOTE_H__
    3535
    36 #include <packet/packet.h>
     36#include <net/packet.h>
    3737
    3838extern int packet_translate_remote(int, packet_ref, packet_id_t);

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

    rc0e74b1 rae972834  
    4545#include <adt/dynamic_fifo.h>
    4646#include <adt/int_map.h>
    47 #include <packet/packet.h>
     47#include <net/packet.h>
    4848
    4949/** Initial size of the received packet queue.

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

    rc0e74b1 rae972834  
    3939
    4040#include <net/socket_codes.h>
    41 
    42 #include <packet/packet.h>
     41#include <net/packet.h>
    4342#include <net_device.h>
    4443#include <net/inet.h>

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

    rc0e74b1 rae972834  
    4343#include <net_messages.h>
    4444#include <net_device.h>
    45 #include <packet/packet.h>
    46 #include <packet/packet_client.h>
     45#include <net/packet.h>
     46#include <packet_client.h>
    4747#include <tl_messages.h>
    4848
Note: See TracChangeset for help on using the changeset viewer.