rt2x00: rt61pci: implement queue_init callback

The generic rt2x00 code has been changed to allow the
drivers toimplement dynamic data_queue initialization.

Remove the static data queue descriptor structures
and implement the queue_init callback instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Tested-by: Jakub Kicinski <kubakici@wp.pl>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 33 insertions, 21 deletions

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 7e1759b3e49a..17507d12d5ee 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -3025,26 +3025,40 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .config                 = rt61pci_config,
 };
 
-static const struct data_queue_desc rt61pci_queue_rx = {
-        .entry_num              = 32,
-        .data_size              = DATA_FRAME_SIZE,
-        .desc_size              = RXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_mmio),
-};
+static void rt61pci_queue_init(struct data_queue *queue)
+{
+        switch (queue->qid) {
+        case QID_RX:
+                queue->limit = 32;
+                queue->data_size = DATA_FRAME_SIZE;
+                queue->desc_size = RXD_DESC_SIZE;
+                queue->priv_size = sizeof(struct queue_entry_priv_mmio);
+                break;
 
-static const struct data_queue_desc rt61pci_queue_tx = {
-        .entry_num              = 32,
-        .data_size              = DATA_FRAME_SIZE,
-        .desc_size              = TXD_DESC_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_mmio),
-};
+        case QID_AC_VO:
+        case QID_AC_VI:
+        case QID_AC_BE:
+        case QID_AC_BK:
+                queue->limit = 32;
+                queue->data_size = DATA_FRAME_SIZE;
+                queue->desc_size = TXD_DESC_SIZE;
+                queue->priv_size = sizeof(struct queue_entry_priv_mmio);
+                break;
 
-static const struct data_queue_desc rt61pci_queue_bcn = {
-        .entry_num              = 4,
-        .data_size              = 0, /* No DMA required for beacons */
-        .desc_size              = TXINFO_SIZE,
-        .priv_size              = sizeof(struct queue_entry_priv_mmio),
-};
+        case QID_BEACON:
+                queue->limit = 4;
+                queue->data_size = 0; /* No DMA required for beacons */
+                queue->desc_size = TXINFO_SIZE;
+                queue->priv_size = sizeof(struct queue_entry_priv_mmio);
+                break;
+
+        case QID_ATIM:
+                /* fallthrough */
+        default:
+                BUG();
+                break;
+        }
+}
 
 static const struct rt2x00_ops rt61pci_ops = {
         .name                   = KBUILD_MODNAME,
@@ -3053,9 +3067,7 @@ static const struct rt2x00_ops rt61pci_ops = {
         .rf_size                = RF_SIZE,
         .tx_queues              = NUM_TX_QUEUES,
         .extra_tx_headroom      = 0,
-        .rx                     = &rt61pci_queue_rx,
-        .tx                     = &rt61pci_queue_tx,
-        .bcn                    = &rt61pci_queue_bcn,
+        .queue_init             = rt61pci_queue_init,
         .lib                    = &rt61pci_rt2x00_ops,
         .hw                     = &rt61pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS