Changeset 3f03199 in mainline for uspace/srv/net/inetsrv/icmp.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/net/inetsrv/icmp.c (modified) (2 diffs)

uspace/srv/net/inetsrv/icmp.c

@@ -105 +105 @@
         reply->checksum = host2uint16_t_be(checksum);
 
+        rdgram.iplink = 0;
         rdgram.src = dgram->dest;
         rdgram.dest = dgram->src;
@@ -171 +172 @@
         inet_addr_set(sdu->dest, &dgram.dest);
         
+        dgram.iplink = 0;
         dgram.tos = ICMP_TOS;
         dgram.data = rdata;