Changeset 4687a26c in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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/net/net_standalone.c (modified) (2 diffs)

uspace/srv/net/net/net_standalone.c

@@ -38 +38 @@
 
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 
-#include <net_messages.h>
 #include <ip_interface.h>
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet_server.h>
+#include <packet_server.h>
 
 #include "net.h"
@@ -94 +94 @@
  * @return EOK on success.
  * @return ENOTSUP if the message is not known.
- * @return Other error codes as defined for each bundled module
- *         message function.
+ * @return Other error codes.
  *
  */