Changeset 3f03199 in mainline for uspace/srv/net/ethip/atrans.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/ethip/atrans.c (modified) (1 diff)

uspace/srv/net/ethip/atrans.c

@@ -51 +51 @@
 static ethip_atrans_t *atrans_find(addr32_t ip_addr)
 {
-        list_foreach(atrans_list, link) {
-                ethip_atrans_t *atrans = list_get_instance(link,
-                    ethip_atrans_t, atrans_list);
-
+        list_foreach(atrans_list, atrans_list, ethip_atrans_t, atrans) {
                 if (atrans->ip_addr == ip_addr)
                         return atrans;