Changeset 60ab6c3 in mainline for uspace/srv/net/il/arp/arp_module.c

Timestamp:

2010-03-10T05:46:54Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5782081

Parents:

71b00dcc (diff), b48ebd19 (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/il/arp/arp_module.c (modified) (3 diffs)

uspace/srv/net/il/arp/arp_module.c

@@ -58 +58 @@
 #define NAME    "ARP protocol"
 
+/** ARP module global data.
+ */
+extern arp_globals_t    arp_globals;
+
+/** Processes the ARP message.
+ *  @param[in] callid The message identifier.
+ *  @param[in] call The message parameters.
+ *  @param[out] answer The message answer parameters.
+ *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for the arp_message() function.
+ */
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+
 /** Prints the module name.
  *  @see NAME
@@ -72 +86 @@
 int module_start(async_client_conn_t client_connection);
 
-/** Processes the ARP message.
- *  @param[in] callid The message identifier.
- *  @param[in] call The message parameters.
- *  @param[out] answer The message answer parameters.
- *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for the arp_message() function.
- */
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
-
-/** ARP module global data.
- */
-extern arp_globals_t    arp_globals;
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return arp_message(callid, call, answer, answer_count);
+}
 
 void module_print_name(void){
@@ -110 +114 @@
 }
 
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return arp_message(callid, call, answer, answer_count);
-}
-
 /** @}
  */