Changeset a7a85d16 in mainline for uspace/srv/net/net/net.c

Timestamp:

2010-10-16T17:16:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade

Children:

668f8cbf, e0e568ff, f14291b

Parents:

ef689ef0 (diff), c62ae1d6 (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/net/net.c (modified) (3 diffs)

uspace/srv/net/net/net.c

@@ -46 +46 @@
 
 #include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <ipc/net.h>
-#include <ipc/services.h>
+#include <ipc/net_net.h>
+#include <ipc/il.h>
 
 #include <net/modules.h>
@@ -55 +57 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
-#include <il_messages.h>
 #include <netif_remote.h>
 #include <net/device.h>
@@ -61 +62 @@
 #include <net_interface.h>
 #include <ip_interface.h>
-#include <net_net_messages.h>
 
 #include "net.h"