Changeset f2d2c604 in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-10-27T21:51:14Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

069015f2

Parents:

e7f6389 (diff), 0a3fbc7 (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/nil/eth/eth_module.c (modified) (4 diffs)

uspace/srv/net/nil/eth/eth_module.c

@@ -36 +36 @@
  */
 
+#include "eth.h"
+
 #include <async.h>
 #include <stdio.h>
@@ -48 +50 @@
 #include <nil_local.h>
 
-#include "eth.h"
-
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
@@ -59 +59 @@
         
         ipcarg_t phonehash;
-        if (ERROR_OCCURRED(nil_initialize(net_phone))
-            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
+        if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
+            ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
@@ -71 +71 @@
 }
 
-int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+int
+nil_module_message_standalone(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
         return nil_message_standalone(name, callid, call, answer, answer_count);