Changeset ec1bdc8 in mainline for uspace/lib/net


Ignore:
Timestamp:
2010-09-26T18:57:30Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3fe57ea7
Parents:
2a786f9 (diff), 70ce016 (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
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/adt/module_map.c

    r2a786f9 rec1bdc8  
    3838#include <task.h>
    3939#include <unistd.h>
     40#include <err.h>
    4041
    4142#include <ipc/services.h>
    4243
    43 #include <net_err.h>
    4444#include <net_modules.h>
    4545

  • uspace/lib/net/generic/packet_remote.c

    r2a786f9 rec1bdc8  
    3838#include <async.h>
    3939#include <errno.h>
     40#include <err.h>
    4041#include <ipc/ipc.h>
    4142#include <sys/mman.h>
    4243
    43 #include <net_err.h>
    4444#include <net_messages.h>
    4545#include <packet/packet.h>

  • uspace/lib/net/il/ip_client.c

    r2a786f9 rec1bdc8  
    4040
    4141#include <ip_client.h>
    42 #include <socket_errno.h>
    4342#include <packet/packet.h>
    4443#include <packet/packet_client.h>

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

    r2a786f9 rec1bdc8  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
     46#include <err.h>
    4647
    4748#include <adt/measured_strings.h>
    48 #include <net_err.h>
    4949#include <net_device.h>
    5050#include <packet/packet.h>

  • uspace/lib/net/netif/netif_local.c

    r2a786f9 rec1bdc8  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 
    45 #include <net_err.h>
     44#include <err.h>
     45
    4646#include <net_messages.h>
    4747#include <net_modules.h>

  • uspace/lib/net/tl/tl_common.c

    r2a786f9 rec1bdc8  
    3838#include <async.h>
    3939#include <ipc/services.h>
    40 
    41 #include <net_err.h>
     40#include <errno.h>
     41#include <err.h>
     42
    4243#include <packet/packet.h>
    4344#include <packet/packet_client.h>
    … …  
    5152#include <ip_remote.h>
    5253#include <socket_codes.h>
    53 #include <socket_errno.h>
    5454#include <ip_interface.h>
    5555#include <tl_interface.h>
Note: See TracChangeset for help on using the changeset viewer.