Changeset 97c7682 in mainline for uspace/srv/net/tcp/segment.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/net/tcp/segment.c (moved) (moved from uspace/srv/net/tl/tcp/segment.c ) (1 diff)

uspace/srv/net/tcp/segment.c

@@ -248 +248 @@
 void tcp_segment_dump(tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "Segment dump:");
-        log_msg(LVL_DEBUG, " - ctrl = %u", (unsigned)seg->ctrl);
-        log_msg(LVL_DEBUG, " - seq = % " PRIu32, seg->seq);
-        log_msg(LVL_DEBUG, " - ack = % " PRIu32, seg->ack);
-        log_msg(LVL_DEBUG, " - len = % " PRIu32, seg->len);
-        log_msg(LVL_DEBUG, " - wnd = % " PRIu32, seg->wnd);
-        log_msg(LVL_DEBUG, " - up = % " PRIu32, seg->up);
+        log_msg(LVL_DEBUG2, "Segment dump:");
+        log_msg(LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl);
+        log_msg(LVL_DEBUG2, " - seq = % " PRIu32, seg->seq);
+        log_msg(LVL_DEBUG2, " - ack = % " PRIu32, seg->ack);
+        log_msg(LVL_DEBUG2, " - len = % " PRIu32, seg->len);
+        log_msg(LVL_DEBUG2, " - wnd = % " PRIu32, seg->wnd);
+        log_msg(LVL_DEBUG2, " - up = % " PRIu32, seg->up);
 }