mac80211: clean up get_tx_stats callback

The callback takes a ieee80211_tx_queue_stats with a contained
array of ieee80211_tx_queue_stats_data, remove the former, rename
the latter to ieee80211_tx_queue_stats and make tx_stats() take
the array directly.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
index fcacafb04346..08c8a087f30e 100644
--- a/drivers/net/wireless/b43/pio.c
+++ b/drivers/net/wireless/b43/pio.c
@@ -611,18 +611,16 @@ void b43_pio_get_tx_stats(struct b43_wldev *dev,
 {
         const int nr_queues = dev->wl->hw->queues;
         struct b43_pio_txqueue *q;
-        struct ieee80211_tx_queue_stats_data *data;
         unsigned long flags;
         int i;
 
         for (i = 0; i < nr_queues; i++) {
-                data = &(stats->data[i]);
                 q = select_queue_by_priority(dev, i);
 
                 spin_lock_irqsave(&q->lock, flags);
-                data->len = B43_PIO_MAX_NR_TXPACKETS - q->free_packet_slots;
-                data->limit = B43_PIO_MAX_NR_TXPACKETS;
-                data->count = q->nr_tx_packets;
+                stats[i].len = B43_PIO_MAX_NR_TXPACKETS - q->free_packet_slots;
+                stats[i].limit = B43_PIO_MAX_NR_TXPACKETS;
+                stats[i].count = q->nr_tx_packets;
                 spin_unlock_irqrestore(&q->lock, flags);
         }
 }