Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rt2x00 / rt2x00queue.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 4d91795dc6a22afd411f809e35f218cef8893d01..952a0490eb1706573061d4ac056a12f6a17032b7 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -832,7 +832,9 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
 bool rt2x00queue_for_each_entry(struct data_queue *queue,
                                enum queue_index start,
                                enum queue_index end,
-                               bool (*fn)(struct queue_entry *entry))
+                               void *data,
+                               bool (*fn)(struct queue_entry *entry,
+                                          void *data))
 {
        unsigned long irqflags;
        unsigned int index_start;
@@ -863,17 +865,17 @@ bool rt2x00queue_for_each_entry(struct data_queue *queue,
         */
        if (index_start < index_end) {
                for (i = index_start; i < index_end; i++) {
-                       if (fn(&queue->entries[i]))
+                       if (fn(&queue->entries[i], data))
                                return true;
                }
        } else {
                for (i = index_start; i < queue->limit; i++) {
-                       if (fn(&queue->entries[i]))
+                       if (fn(&queue->entries[i], data))
                                return true;
                }
 
                for (i = 0; i < index_end; i++) {
-                       if (fn(&queue->entries[i]))
+                       if (fn(&queue->entries[i], data))
                                return true;
                }
        }