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

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/reass.c (modified) (2 diffs)

uspace/srv/net/inetsrv/reass.c

@@ -86 +86 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inet_reass_queue_packet()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_reass_queue_packet()");
 
         fibril_mutex_lock(&reass_dgram_map_lock);
@@ -95 +95 @@
                 /* Only happens when we are out of memory */
                 fibril_mutex_unlock(&reass_dgram_map_lock);
-                log_msg(LVL_DEBUG, "Allocation failed, packet dropped.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Allocation failed, packet dropped.");
                 return ENOMEM;
         }