Changeset b40bfac in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2010-11-08T07:13:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63a1e60

Parents:

d70a463 (diff), 3da12d74 (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

@@ -28 +28 @@
 
 /** @addtogroup net
- *  @{
+ * @{
  */
 
 /** @file
- *  Wrapper for the standalone networking module.
+ * Wrapper for the standalone networking module.
  */
 
+#include "net.h"
+
 #include <str.h>
-
+#include <adt/measured_strings.h>
+#include <adt/module_map.h>
 #include <ipc/ipc.h>
 #include <ipc/net.h>
 
 #include <ip_interface.h>
-#include <adt/measured_strings.h>
-#include <adt/module_map.h>
 #include <packet_server.h>
 
-#include "net.h"
-
-/** Networking module global data.
- */
+/** Networking module global data. */
 extern net_globals_t net_globals;
 
@@ -60 +58 @@
  *
  */
-int net_initialize_build(async_client_conn_t client_connection){
+int net_initialize_build(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;