Changeset 132ab5d1 in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -39 +39 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril_synch.h>
 #include <inet/iplink_srv.h>
@@ -280 +281 @@
         free(data);
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() done, rc=%d", rc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() done, rc=%s", str_error_name(rc));
         async_answer_0(callid, rc);
 }
@@ -328 +329 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for NIC "
-                    "discovery (%d).", rc);
+                    "discovery: %s.", str_error(rc));
                 return rc;
         }
@@ -357 +358 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_send(size=%zu)", size);
         rc = nic_send_frame(nic->sess, data, size);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "nic_send_frame -> %d", rc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "nic_send_frame -> %s", str_error_name(rc));
         return rc;
 }