Changeset ae972834 in mainline for uspace/srv

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/srv

Files:

• hw/netif/dp8390/dp8390.c (modified) (1 diff)
• hw/netif/dp8390/dp8390.h (modified) (1 diff)
• hw/netif/dp8390/dp8390_module.c (modified) (1 diff)
• net/il/arp/arp.c (modified) (1 diff)
• net/il/arp/arp_module.c (modified) (1 diff)
• net/il/ip/ip.c (modified) (1 diff)
• net/il/ip/ip_module.c (modified) (1 diff)
• net/net/net.c (modified) (1 diff)
• net/net/net.h (modified) (1 diff)
• net/netif/lo/lo.c (modified) (1 diff)
• net/nil/eth/eth.c (modified) (1 diff)
• net/nil/eth/eth_module.c (modified) (1 diff)
• net/nil/nildummy/nildummy.c (modified) (1 diff)
• net/nil/nildummy/nildummy_module.c (modified) (1 diff)
• net/tl/icmp/icmp.c (modified) (1 diff)
• net/tl/icmp/icmp_module.c (modified) (1 diff)
• net/tl/tcp/tcp.c (modified) (1 diff)
• net/tl/tcp/tcp.h (modified) (1 diff)
• net/tl/tcp/tcp_module.c (modified) (1 diff)
• net/tl/udp/udp.c (modified) (1 diff)
• net/tl/udp/udp_module.c (modified) (1 diff)

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -38 +38 @@
 
 #include <netif_local.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <net/packet.h>
+#include <packet_client.h>
 
 #include "dp8390_drv.h"

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -36 +36 @@
 #define __NET_NETIF_DP8390_H__
 
-#include <packet/packet.h>
+#include <net/packet.h>
 
 #include "dp8390_port.h"

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -46 +46 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <adt/measured_strings.h>
 #include <net_device.h>

uspace/srv/net/il/arp/arp.c

@@ -55 +55 @@
 #include <protocol_map.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <net/packet.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <il_messages.h>

uspace/srv/net/il/arp/arp_module.c

@@ -47 +47 @@
 #include <net/modules.h>
 #include <net_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <il_local.h>
 

uspace/srv/net/il/ip/ip.c

@@ -68 +68 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <nil_messages.h>

uspace/srv/net/il/ip/ip_module.c

@@ -46 +46 @@
 #include <net/modules.h>
 #include <net_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <il_local.h>
 

uspace/srv/net/net/net.c

@@ -54 +54 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <il_messages.h>
 #include <netif_remote.h>

uspace/srv/net/net/net.h

@@ -46 +46 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 
 /** @name Modules definitions

uspace/srv/net/netif/lo/lo.c

@@ -47 +47 @@
 #include <net/modules.h>
 #include <adt/measured_strings.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <net_device.h>
 #include <nil_interface.h>

uspace/srv/net/nil/eth/eth.c

@@ -59 +59 @@
 #include <il_interface.h>
 #include <adt/measured_strings.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <nil_local.h>

uspace/srv/net/nil/eth/eth_module.c

@@ -45 +45 @@
 #include <net/modules.h>
 #include <net_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <nil_local.h>
 

uspace/srv/net/nil/nildummy/nildummy.c

@@ -52 +52 @@
 #include <il_interface.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_remote.h>
 #include <nil_local.h>

uspace/srv/net/nil/nildummy/nildummy_module.c

@@ -45 +45 @@
 #include <net/modules.h>
 #include <net_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <nil_local.h>
 

uspace/srv/net/tl/icmp/icmp.c

@@ -56 +56 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>

uspace/srv/net/tl/icmp/icmp_module.c

@@ -45 +45 @@
 
 #include <net/modules.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net_interface.h>
 #include <tl_local.h>

uspace/srv/net/tl/tcp/tcp.c

@@ -58 +58 @@
 #include <net_messages.h>
 #include <adt/dynamic_fifo.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>

uspace/srv/net/tl/tcp/tcp.h

@@ -40 +40 @@
 #include <fibril_synch.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net_device.h>
 #include <socket_core.h>

uspace/srv/net/tl/tcp/tcp_module.c

@@ -47 +47 @@
 #include <net/modules.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net_interface.h>
 #include <ip_interface.h>

uspace/srv/net/tl/udp/udp.c

@@ -55 +55 @@
 #include <net_messages.h>
 #include <adt/dynamic_fifo.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>

uspace/srv/net/tl/udp/udp_module.c

@@ -45 +45 @@
 
 #include <net/modules.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net_interface.h>
 #include <tl_local.h>