aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-17 03:34:19 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-17 22:21:00 -0400
commite8a0464cc950972824e2e128028ae3db666ec1ed (patch)
tree5022b95396c0f3b313531bc39b19543c03551b9a /net/mac80211
parent070825b3840a743e21ebcc44f8279708a4fed977 (diff)
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/main.c4
-rw-r--r--net/mac80211/wme.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index af0056e7e5b3..b486e634f4fe 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)
621 621
622 /* ensure that TX flow won't interrupt us 622 /* ensure that TX flow won't interrupt us
623 * until the end of the call to requeue function */ 623 * until the end of the call to requeue function */
624 txq = &local->mdev->tx_queue; 624 txq = netdev_get_tx_queue(local->mdev, 0);
625 spin_lock_bh(&txq->lock); 625 spin_lock_bh(&txq->lock);
626 626
627 /* create a new queue for this aggregation */ 627 /* 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)
862 862
863 /* avoid ordering issues: we are the only one that can modify 863 /* avoid ordering issues: we are the only one that can modify
864 * the content of the qdiscs */ 864 * the content of the qdiscs */
865 txq = &local->mdev->tx_queue; 865 txq = netdev_get_tx_queue(local->mdev, 0);
866 spin_lock_bh(&txq->lock); 866 spin_lock_bh(&txq->lock);
867 /* remove the queue for this aggregation */ 867 /* remove the queue for this aggregation */
868 ieee80211_ht_agg_queue_remove(local, sta, tid, 1); 868 ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 6ae43a3c7726..f014cd38c2d0 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -574,7 +574,7 @@ static struct Qdisc_ops wme_qdisc_ops __read_mostly =
574 574
575void ieee80211_install_qdisc(struct net_device *dev) 575void ieee80211_install_qdisc(struct net_device *dev)
576{ 576{
577 struct netdev_queue *txq = &dev->tx_queue; 577 struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
578 struct Qdisc *qdisc; 578 struct Qdisc *qdisc;
579 579
580 qdisc = qdisc_create_dflt(dev, txq, 580 qdisc = qdisc_create_dflt(dev, txq,
@@ -596,7 +596,7 @@ void ieee80211_install_qdisc(struct net_device *dev)
596 596
597int ieee80211_qdisc_installed(struct net_device *dev) 597int ieee80211_qdisc_installed(struct net_device *dev)
598{ 598{
599 struct netdev_queue *txq = &dev->tx_queue; 599 struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
600 600
601 return txq->qdisc_sleeping->ops == &wme_qdisc_ops; 601 return txq->qdisc_sleeping->ops == &wme_qdisc_ops;
602} 602}
@@ -617,7 +617,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
617 struct sta_info *sta, u16 tid) 617 struct sta_info *sta, u16 tid)
618{ 618{
619 int i; 619 int i;
620 struct netdev_queue *txq = &local->mdev->tx_queue; 620 struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
621 struct ieee80211_sched_data *q = 621 struct ieee80211_sched_data *q =
622 qdisc_priv(txq->qdisc_sleeping); 622 qdisc_priv(txq->qdisc_sleeping);
623 DECLARE_MAC_BUF(mac); 623 DECLARE_MAC_BUF(mac);
@@ -652,14 +652,14 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
652} 652}
653 653
654/** 654/**
655 * the caller needs to hold local->mdev->tx_queue.lock 655 * the caller needs to hold netdev_get_tx_queue(local->mdev, X)->lock
656 */ 656 */
657void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local, 657void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
658 struct sta_info *sta, u16 tid, 658 struct sta_info *sta, u16 tid,
659 u8 requeue) 659 u8 requeue)
660{ 660{
661 struct ieee80211_hw *hw = &local->hw; 661 struct ieee80211_hw *hw = &local->hw;
662 struct netdev_queue *txq = &local->mdev->tx_queue; 662 struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
663 struct ieee80211_sched_data *q = 663 struct ieee80211_sched_data *q =
664 qdisc_priv(txq->qdisc_sleeping); 664 qdisc_priv(txq->qdisc_sleeping);
665 int agg_queue = sta->tid_to_tx_q[tid]; 665 int agg_queue = sta->tid_to_tx_q[tid];
@@ -676,7 +676,7 @@ void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
676 676
677void ieee80211_requeue(struct ieee80211_local *local, int queue) 677void ieee80211_requeue(struct ieee80211_local *local, int queue)
678{ 678{
679 struct netdev_queue *txq = &local->mdev->tx_queue; 679 struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
680 struct Qdisc *root_qd = txq->qdisc_sleeping; 680 struct Qdisc *root_qd = txq->qdisc_sleeping;
681 struct ieee80211_sched_data *q = qdisc_priv(root_qd); 681 struct ieee80211_sched_data *q = qdisc_priv(root_qd);
682 struct Qdisc *qdisc = q->queues[queue]; 682 struct Qdisc *qdisc = q->queues[queue];