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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/nil/eth/eth_module.c

    re7f6389 rf2d2c604  
    3636 */
    3737
     38#include "eth.h"
     39
    3840#include <async.h>
    3941#include <stdio.h>
     
    4850#include <nil_local.h>
    4951
    50 #include "eth.h"
    51 
    5252int nil_module_start_standalone(async_client_conn_t client_connection)
    5353{
     
    5959       
    6060        ipcarg_t phonehash;
    61         if (ERROR_OCCURRED(nil_initialize(net_phone))
    62             || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
     61        if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
     62            ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
    6363                pm_destroy();
    6464                return ERROR_CODE;
     
    7171}
    7272
    73 int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
    74     ipc_call_t *answer, int *answer_count)
     73int
     74nil_module_message_standalone(const char *name, ipc_callid_t callid,
     75    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
    7576{
    7677        return nil_message_standalone(name, callid, call, answer, answer_count);
Note: See TracChangeset for help on using the changeset viewer.