Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/srv/net/udp/service.c	(revision cbb37b60574b56acd864c01b9afca6a0ce28867f)
@@ -331,9 +331,10 @@
  * Handle client request to create callback session.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_callback_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle 
+ * @param icall         Async request data
+ */
+static void
+udp_callback_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -354,9 +355,10 @@
  * Handle client request to create association.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static
+void udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -401,9 +403,10 @@
  * Handle client request to destroy association.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_assoc_destroy_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static void
+udp_assoc_destroy_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -422,9 +425,10 @@
  * Handle client request to set no local address flag.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_assoc_set_nolocal_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static void
+udp_assoc_set_nolocal_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -443,9 +447,10 @@
  * Handle client request to send message.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_assoc_send_msg_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle 
+ * @param icall         Async request data
+ */
+static void
+udp_assoc_send_msg_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -541,9 +546,10 @@
  * Handle client request to get information on received message.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_rmsg_info_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static void
+udp_rmsg_info_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -588,9 +594,10 @@
  * Handle client request to read data from first received message.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_rmsg_read_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static void
+udp_rmsg_read_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -644,9 +651,10 @@
  * to the next one.
  *
- * @param client   UDP client
- * @param iid      Async request ID
- * @param icall    Async request data
- */
-static void udp_rmsg_discard_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+ * @param client        UDP client
+ * @param icall_handle  Async request call handle
+ * @param icall         Async request data
+ */
+static void
+udp_rmsg_discard_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {