Changeset ae972834 in mainline

Timestamp:

2010-10-08T21:47:40Z (14 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

Files:

• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/net/packet.c (added)
• lib/c/include/ipc/packet.h (moved) (moved from uspace/lib/socket/include/packet/packet_messages.h ) (view diffs)
• lib/c/include/net/packet.h (added)
• lib/c/include/net/packet_header.h (moved) (moved from uspace/lib/socket/include/packet/packet_header.h ) (view diffs)
• lib/net/Makefile (modified) (view diffs)
• lib/net/generic/packet_client.c (moved) (moved from uspace/lib/socket/packet/packet_client.c ) (view diffs)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/net/generic/socket_core.c (moved) (moved from uspace/lib/socket/generic/socket_core.c ) (view diffs)
• lib/net/il/ip_client.c (modified) (view diffs)
• lib/net/il/ip_remote.c (modified) (view diffs)
• lib/net/include/icmp_client.h (modified) (view diffs)
• lib/net/include/icmp_interface.h (modified) (view diffs)
• lib/net/include/il_interface.h (modified) (view diffs)
• lib/net/include/ip_client.h (modified) (view diffs)
• lib/net/include/ip_interface.h (modified) (view diffs)
• lib/net/include/netif_interface.h (modified) (view diffs)
• lib/net/include/netif_local.h (modified) (view diffs)
• lib/net/include/nil_interface.h (modified) (view diffs)
• lib/net/include/packet_client.h (moved) (moved from uspace/lib/socket/include/packet/packet_client.h ) (view diffs)
• lib/net/include/packet_remote.h (modified) (view diffs)
• lib/net/include/socket_core.h (moved) (moved from uspace/lib/socket/include/socket_core.h ) (view diffs)
• lib/net/include/tl_common.h (modified) (view diffs)
• lib/net/include/tl_interface.h (modified) (view diffs)
• lib/net/netif/netif_local.c (modified) (view diffs)
• lib/net/netif/netif_nil_bundle.c (modified) (view diffs)
• lib/net/netif/netif_remote.c (modified) (view diffs)
• lib/net/nil/nil_remote.c (modified) (view diffs)
• lib/net/tl/icmp_client.c (modified) (view diffs)
• lib/net/tl/icmp_remote.c (modified) (view diffs)
• lib/net/tl/tl_common.c (modified) (view diffs)
• lib/socket/Makefile (modified) (view diffs)
• lib/socket/include/icmp_api.h (modified) (view diffs)
• lib/socket/include/net_messages.h (modified) (view diffs)
• lib/socket/include/packet/packet.h (deleted)
• lib/socket/include/packet/packet_local.h (added)
• lib/socket/packet/packet.c (deleted)
• lib/socket/packet/packet_server.c (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390.c (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390.h (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/arp/arp_module.c (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/net/il/ip/ip_module.c (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/net/net.h (modified) (view diffs)
• srv/net/netif/lo/lo.c (modified) (view diffs)
• srv/net/nil/eth/eth.c (modified) (view diffs)
• srv/net/nil/eth/eth_module.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.h (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• srv/net/tl/udp/udp.c (modified) (view diffs)
• srv/net/tl/udp/udp_module.c (modified) (view diffs)