Changeset 70253688 in mainline for uspace/srv/net/ethip/pdu.c

Timestamp:

2012-09-07T08:12:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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/ethip/pdu.c (modified) (2 diffs)

uspace/srv/net/ethip/pdu.c

@@ -69 +69 @@
             frame->size);
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
@@ -104 +105 @@
             frame->size);
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);