Changeset efdfebc in mainline for uspace/srv/net/inetsrv/icmp.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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 mainline changes.

File:

• uspace/srv/net/inetsrv/icmp.c (modified) (3 diffs)

uspace/srv/net/inetsrv/icmp.c

@@ -57 +57 @@
         uint8_t type;
 
-        log_msg(LVL_DEBUG, "icmp_recv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv()");
 
         if (dgram->size < 1)
@@ -84 +84 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "icmp_recv_echo_request()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_request()");
 
         if (dgram->size < sizeof(icmp_echo_t))
@@ -124 +124 @@
         uint16_t ident;
 
-        log_msg(LVL_DEBUG, "icmp_recv_echo_reply()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()");
 
         if (dgram->size < sizeof(icmp_echo_t))