Changeset ef689ef0 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-10-14T22:08:50Z (14 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.

File:

• uspace/srv/net/il/ip/ip.c (modified) (2 diffs)

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

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -52 +53 @@
 #include <net/inet.h>
 #include <net/modules.h>
-
-#include <net_messages.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <net/icmp_codes.h>
+
 #include <arp_interface.h>
 #include <net_checksum.h>
-#include <net_device.h>
 #include <icmp_client.h>
-#include <net/icmp_codes.h>
 #include <icmp_interface.h>
 #include <il_interface.h>