Changeset db71e2a in mainline for uspace/srv/net/tcp/tqueue.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/net/tcp/tqueue.c (modified) (1 diff)

uspace/srv/net/tcp/tqueue.c

@@ -282 +282 @@
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)",
-            sp->foreign.addr.ipv4, sp->foreign.port,
-            sp->local.addr.ipv4, sp->local.port, seg);
-
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
+            "tcp_transmit_segment(f:(%u),l:(%u), %p)",
+            sp->local.port, sp->foreign.port, seg);
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
             seg->seq, seg->wnd);