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

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/inetsrv/reass.c (modified) (2 diffs)

uspace/srv/net/inetsrv/reass.c

@@ -139 +139 @@
                     dgram_link);
 
-                if (f1->packet.src.ipv4 == packet->src.ipv4 &&
-                    f1->packet.dest.ipv4 == packet->dest.ipv4 &&
-                    f1->packet.proto == packet->proto &&
-                    f1->packet.ident == packet->ident) {
+                if ((inet_addr_compare(&f1->packet.src, &packet->src)) &&
+                    (inet_addr_compare(&f1->packet.dest, &packet->dest)) &&
+                    (f1->packet.proto == packet->proto) &&
+                    (f1->packet.ident == packet->ident)) {
                         /* Match */
                         return rdg;
@@ -164 +164 @@
                 return NULL;
 
-        link_initialize(&rdg->map_link);
+        list_append(&rdg->map_link, &reass_dgram_map);
         list_initialize(&rdg->frags);