rt2x00: add queue_init callback to rt2x00_ops

The driver uses static data structures for initializing
specific fields of a given data queue. These static
queue data descriptor structures are containing values
which related to a given chipset.

Even though the values are chip specific, the actual
selection of the used structure is based on device
specific vendor/product identifiers. This approach works,
but it is not always reliable. Sometimes the vendor and/or
device IDs of the PCI and USB devices contains improper
values which makes it impossible to select the correct
structure for such devices.

The patch adds a new callback to tr2x00_ops which
is called after the chipset detection is finished.
This allows the drivers to do dynamic initialization
of the data_queue structure for a given queue based
on the actual chipset.

After each driver implements the queue_init callback,
the data_queue_desc structure will be removed.

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

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 7510723a8c378389b93b90001efe088118f045bb..2d2db6472c048327fa10d4e73b83cdc7eb56f68b 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -653,6 +653,7 @@ struct rt2x00_ops {
        const struct data_queue_desc *tx;
        const struct data_queue_desc *bcn;
        const struct data_queue_desc *atim;
+       void (*queue_init)(struct data_queue *queue);
        const struct rt2x00lib_ops *lib;
        const void *drv;
        const struct ieee80211_ops *hw;

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 3ae2264fdabc18f3c0c0be3ad8d2371f0a39d7b7..2a99ff1714ac494a9e10986aabc24ba12aefb759 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -1306,8 +1306,6 @@ rt2x00queue_get_qdesc_by_qid(struct rt2x00_dev *rt2x00dev,
 static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
                             struct data_queue *queue, enum data_queue_qid qid)
 {
-       const struct data_queue_desc *qdesc;
-
        mutex_init(&queue->status_lock);
        spin_lock_init(&queue->tx_lock);
        spin_lock_init(&queue->index_lock);
@@ -1319,14 +1317,20 @@ static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
        queue->cw_min = 5;
        queue->cw_max = 10;
 
-       qdesc = rt2x00queue_get_qdesc_by_qid(rt2x00dev, qid);
-       BUG_ON(!qdesc);
+       if (rt2x00dev->ops->queue_init) {
+               rt2x00dev->ops->queue_init(queue);
+       } else {
+               const struct data_queue_desc *qdesc;
+
+               qdesc = rt2x00queue_get_qdesc_by_qid(rt2x00dev, qid);
+               BUG_ON(!qdesc);
 
-       queue->limit = qdesc->entry_num;
-       queue->data_size = qdesc->data_size;
-       queue->desc_size = qdesc->desc_size;
-       queue->winfo_size = qdesc->winfo_size;
-       queue->priv_size = qdesc->priv_size;
+               queue->limit = qdesc->entry_num;
+               queue->data_size = qdesc->data_size;
+               queue->desc_size = qdesc->desc_size;
+               queue->winfo_size = qdesc->winfo_size;
+               queue->priv_size = qdesc->priv_size;
+       }
 
        queue->threshold = DIV_ROUND_UP(queue->limit, 10);
 }