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

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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 mainline changes.

File:

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

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

@@ -42 +42 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <err.h>
 
-#include <net_err.h>
-#include <net_modules.h>
+#include <net/modules.h>
 #include <net_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <il_local.h>
 
@@ -79 +79 @@
         
         async_set_client_connection(client_connection);
-        ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
+        ip_globals.net_phone = net_connect_module();
         ERROR_PROPAGATE(pm_init());