Changeset cf3aee19 in mainline for uspace/srv/net/inetsrv/reass.c

Timestamp:

2015-06-17T23:45:24Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (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:

Sync with mainline

File:

• uspace/srv/net/inetsrv/reass.c (modified) (1 diff)

uspace/srv/net/inetsrv/reass.c

@@ -325 +325 @@
                 return ENOMEM;
 
+        /* XXX What if different fragments came from different link? */
+        dgram.iplink = frag->packet.link_id;
         dgram.size = dgram_size;
         dgram.src = frag->packet.src;