rt2x00: Make rt2x00_queue_entry_for_each more flexible

Allow passing a void pointer to rt2x00_queue_entry_for_each which in
turn in provided to the callback function.

Furthermore, allow the callback function to stop processing by returning
true. And also notify the caller of rt2x00_queue_entry_for_each if the
loop was canceled by the callback.

No functional changes, just preparation for an upcoming patch.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 19 insertions, 9 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index d03eef28f036..458bb489bc7c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -650,10 +650,12 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
         return ret;
 }
 
-void rt2x00queue_for_each_entry(struct data_queue *queue,
+bool rt2x00queue_for_each_entry(struct data_queue *queue,
                                 enum queue_index start,
                                 enum queue_index end,
-                                void (*fn)(struct queue_entry *entry))
+                                void *data,
+                                bool (*fn)(struct queue_entry *entry,
+                                           void *data))
 {
         unsigned long irqflags;
         unsigned int index_start;
@@ -664,7 +666,7 @@ void rt2x00queue_for_each_entry(struct data_queue *queue,
                 ERROR(queue->rt2x00dev,
                       "Entry requested from invalid index range (%d - %d)\n",
                       start, end);
-                return;
+                return true;
         }
 
         /*
@@ -683,15 +685,23 @@ void rt2x00queue_for_each_entry(struct data_queue *queue,
          * send out all frames in the correct order.
          */
         if (index_start < index_end) {
-                for (i = index_start; i < index_end; i++)
-                        fn(&queue->entries[i]);
+                for (i = index_start; i < index_end; i++) {
+                        if (fn(&queue->entries[i], data))
+                                return true;
+                }
         } else {
-                for (i = index_start; i < queue->limit; i++)
-                        fn(&queue->entries[i]);
+                for (i = index_start; i < queue->limit; i++) {
+                        if (fn(&queue->entries[i], data))
+                                return true;
+                }
 
-                for (i = 0; i < index_end; i++)
-                        fn(&queue->entries[i]);
+                for (i = 0; i < index_end; i++) {
+                        if (fn(&queue->entries[i], data))
+                                return true;
+                }
         }
+
+        return false;
 }
 EXPORT_SYMBOL_GPL(rt2x00queue_for_each_entry);