Changeset db71e2a in mainline for uspace/srv/net/udp/udp_inet.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/udp/udp_inet.c (modified) (2 diffs)

uspace/srv/net/udp/udp_inet.c

@@ -67 +67 @@
         pdu->data_size = dgram->size;
 
-        pdu->src.ipv4 = dgram->src.ipv4;
-        pdu->dest.ipv4 = dgram->dest.ipv4;
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "src: 0x%08x, dest: 0x%08x",
-            pdu->src.ipv4, pdu->dest.ipv4);
+        pdu->src = dgram->src;
+        pdu->dest = dgram->dest;
 
         udp_received_pdu(pdu);
@@ -86 +84 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_transmit_pdu()");
 
-        dgram.src.ipv4 = pdu->src.ipv4;
-        dgram.dest.ipv4 = pdu->dest.ipv4;
+        dgram.src = pdu->src;
+        dgram.dest = pdu->dest;
         dgram.tos = 0;
         dgram.data = pdu->data;