Changeset 71b00dcc in mainline for uspace/srv/net/netif/netif_nil_bundle.c

Timestamp:

2010-03-07T22:51:38Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (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:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/netif/netif_nil_bundle.c (modified) (2 diffs)

uspace/srv/net/netif/netif_nil_bundle.c

@@ -61 +61 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int     module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 /** Starts the bundle network interface module.
@@ -69 +69 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int     module_start( async_client_conn_t client_connection );
+int module_start(async_client_conn_t client_connection);
 
-int     module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
-        if( IS_NET_NIL_MESSAGE( call ) || ( IPC_GET_METHOD( * call ) == IPC_M_CONNECT_TO_ME )){
-                return nil_message( callid, call, answer, answer_count );
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        if(IS_NET_NIL_MESSAGE(call) || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)){
+                return nil_message(callid, call, answer, answer_count);
         }else{
-                return netif_message( callid, call, answer, answer_count );
+                return netif_message(callid, call, answer, answer_count);
         }
 }
 
-int     module_start( async_client_conn_t client_connection ){
+int module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;
 
-        ERROR_PROPAGATE( netif_init_module( client_connection ));
-        if( ERROR_OCCURRED( nil_initialize( netif_globals.net_phone ))){
+        ERROR_PROPAGATE(netif_init_module(client_connection));
+        if(ERROR_OCCURRED(nil_initialize(netif_globals.net_phone))){
                 pm_destroy();
                 return ERROR_CODE;