Changeset 54dee316 in mainline

Timestamp:

2013-09-10T10:48:48Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5b08d750, c310f9b

Parents:

684177f1 (diff), 24bb363 (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 ethip fix

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (2 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -372 +372 @@
         
         list_foreach(nic->addr_list, link) {
-                assert(i < count);
-                
                 ethip_link_addr_t *laddr = list_get_instance(link,
                     ethip_link_addr_t, link);
@@ -381 +379 @@
                 if (af != AF_INET6)
                         continue;
+                
+                assert(i < count);
                 
                 addr48_t mac;