Changeset f2d2c604 in mainline for uspace/srv/net/nil/eth/eth_module.c
- Timestamp:
- 2010-10-27T21:51:14Z (14 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/nil/eth/eth_module.c
re7f6389 rf2d2c604 36 36 */ 37 37 38 #include "eth.h" 39 38 40 #include <async.h> 39 41 #include <stdio.h> … … 48 50 #include <nil_local.h> 49 51 50 #include "eth.h"51 52 52 int nil_module_start_standalone(async_client_conn_t client_connection) 53 53 { … … 59 59 60 60 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))) { 63 63 pm_destroy(); 64 64 return ERROR_CODE; … … 71 71 } 72 72 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) 73 int 74 nil_module_message_standalone(const char *name, ipc_callid_t callid, 75 ipc_call_t *call, ipc_call_t *answer, int *answer_count) 75 76 { 76 77 return nil_message_standalone(name, callid, call, answer, answer_count);
Note:
See TracChangeset
for help on using the changeset viewer.