Changeset f1fae414 in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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.

File:

• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (1 diff)

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -168 +168 @@
         
         if (ne2k != NULL) {
-                link_t *frames =
+                list_t *frames =
                     ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
                 
                 if (frames != NULL) {
                         while (!list_empty(frames)) {
-                                frame_t *frame =
-                                    list_get_instance(frames->next, frame_t, link);
+                                frame_t *frame = list_get_instance(
+                                    list_first(frames), frame_t, link);
                                 
                                 list_remove(&frame->link);
-                                nil_received_msg(nil_phone, device_id, frame->packet,
-                                    SERVICE_NONE);
+                                nil_received_msg(nil_phone, device_id,
+                                    frame->packet, SERVICE_NONE);
                                 free(frame);
                         }