Changeset f959a20f in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2019-02-01T22:32:38Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

00b7fc8

Parents:

1a37496

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 21:22:39)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 22:32:38)

Message:

Avoid directly using .head/.next/.prev of list_t/link_t

Use existing constructs from <adt/list.h> instead.

File:

• uspace/lib/nic/src/nic_driver.c (modified) (5 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -329 +329 @@
 
         if (nic_globals.frame_list_cache_size > 0) {
-                frames =
-                    list_get_instance(list_first(&nic_globals.frame_list_cache),
-                    nic_frame_list_t, head);
-                list_remove(&frames->head);
-                list_initialize(frames);
+                frames = list_pop(&nic_globals.frame_list_cache,
+                    nic_frame_list_t, link);
+                assert(frames);
+                list_initialize(&frames->list);
                 nic_globals.frame_list_cache_size--;
                 fibril_mutex_unlock(&nic_globals.lock);
@@ -341 +340 @@
                 frames = malloc(sizeof (nic_frame_list_t));
                 if (frames != NULL)
-                        list_initialize(frames);
+                        list_initialize(&frames->list);
         }
 
@@ -356 +355 @@
                 free(frames);
         } else {
-                list_prepend(&frames->head, &nic_globals.frame_list_cache);
+                list_prepend(&frames->link, &nic_globals.frame_list_cache);
                 nic_globals.frame_list_cache_size++;
                 fibril_mutex_unlock(&nic_globals.lock);
@@ -372 +371 @@
 {
         assert(frame != NULL && frames != NULL);
-        list_append(&frame->link, frames);
+        list_append(&frame->link, &frames->list);
 }
 
@@ -576 +575 @@
         if (frames == NULL)
                 return;
-        while (!list_empty(frames)) {
-                nic_frame_t *frame =
-                    list_get_instance(list_first(frames), nic_frame_t, link);
-
-                list_remove(&frame->link);
+        while (!list_empty(&frames->list)) {
+                nic_frame_t *frame = list_pop(&frames->list, nic_frame_t, link);
                 nic_received_frame(nic_data, frame);
         }