netdev: Allocate multiple queues for TX.

alloc_netdev_mq() now allocates an array of netdev_queue
structures for TX, based upon the queue_count argument.

Furthermore, all accesses to the TX queues are now vectored
through the netdev_get_tx_queue() and netdev_for_each_tx_queue()
interfaces.  This makes it easy to grep the tree for all
things that want to get to a TX queue of a net device.

Problem spots which are not really multiqueue aware yet, and
only work with one queue, can easily be spotted by grepping
for all netdev_get_tx_queue() calls that pass in a zero index.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 8 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index af0056e7e5b..b486e634f4f 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -621,7 +621,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
 
         /* ensure that TX flow won't interrupt us
          * until the end of the call to requeue function */
-        txq = &local->mdev->tx_queue;
+        txq = netdev_get_tx_queue(local->mdev, 0);
         spin_lock_bh(&txq->lock);
 
         /* create a new queue for this aggregation */
@@ -862,7 +862,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
 
         /* avoid ordering issues: we are the only one that can modify
          * the content of the qdiscs */
-        txq = &local->mdev->tx_queue;
+        txq = netdev_get_tx_queue(local->mdev, 0);
         spin_lock_bh(&txq->lock);
         /* remove the queue for this aggregation */
         ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 6ae43a3c772..f014cd38c2d 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -574,7 +574,7 @@ static struct Qdisc_ops wme_qdisc_ops __read_mostly =
 
 void ieee80211_install_qdisc(struct net_device *dev)
 {
-        struct netdev_queue *txq = &dev->tx_queue;
+        struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
         struct Qdisc *qdisc;
 
         qdisc = qdisc_create_dflt(dev, txq,
@@ -596,7 +596,7 @@ void ieee80211_install_qdisc(struct net_device *dev)
 
 int ieee80211_qdisc_installed(struct net_device *dev)
 {
-        struct netdev_queue *txq = &dev->tx_queue;
+        struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
 
         return txq->qdisc_sleeping->ops == &wme_qdisc_ops;
 }
@@ -617,7 +617,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
                         struct sta_info *sta, u16 tid)
 {
         int i;
-        struct netdev_queue *txq = &local->mdev->tx_queue;
+        struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
         struct ieee80211_sched_data *q =
                         qdisc_priv(txq->qdisc_sleeping);
         DECLARE_MAC_BUF(mac);
@@ -652,14 +652,14 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
 }
 
 /**
- * the caller needs to hold local->mdev->tx_queue.lock
+ * the caller needs to hold netdev_get_tx_queue(local->mdev, X)->lock
  */
 void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
                                    struct sta_info *sta, u16 tid,
                                    u8 requeue)
 {
         struct ieee80211_hw *hw = &local->hw;
-        struct netdev_queue *txq = &local->mdev->tx_queue;
+        struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
         struct ieee80211_sched_data *q =
                 qdisc_priv(txq->qdisc_sleeping);
         int agg_queue = sta->tid_to_tx_q[tid];
@@ -676,7 +676,7 @@ void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
 
 void ieee80211_requeue(struct ieee80211_local *local, int queue)
 {
-        struct netdev_queue *txq = &local->mdev->tx_queue;
+        struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
         struct Qdisc *root_qd = txq->qdisc_sleeping;
         struct ieee80211_sched_data *q = qdisc_priv(root_qd);
         struct Qdisc *qdisc = q->queues[queue];