Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2530083 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: use multi-queue master netdevice 



This patch updates mac80211 and drivers to be multi-queue aware and
use that instead of the internal queue mapping. Also does a number
of cleanups in various pieces of the code that fall out and reduces
internal mac80211 state size.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eefce91a

drivers/net/wireless/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -2657,7 +2657,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	if (list_empty(&sc->txbuf)) {

		ATH5K_ERR(sc, "no further txbuf available, dropping packet\n");

		spin_unlock_irqrestore(&sc->txbuflock, flags);

		ieee80211_stop_queue(hw, info->queue);

		ieee80211_stop_queue(hw, skb_get_queue_mapping(skb));

		return -1;

	}

	bf = list_first_entry(&sc->txbuf, struct ath5k_buf, list);

drivers/net/wireless/b43/dma.c

+4 −3
Original line number Diff line number Diff line
@@ -1297,7 +1297,8 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb) 
		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);

	} else {

		/* Decide by priority where to put this frame. */

		ring = select_ring_by_priority(dev, info->queue);

		ring = select_ring_by_priority(

			dev, skb_get_queue_mapping(skb));

	}



	spin_lock_irqsave(&ring->lock, flags);
@@ -1315,7 +1316,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb) 
	/* Assign the queue number to the ring (if not already done before)

	 * so TX status handling can use it. The queue to ring mapping is

	 * static, so we don't need to store it per frame. */

	ring->queue_prio = info->queue;

	ring->queue_prio = skb_get_queue_mapping(skb);



	err = dma_tx_fragment(ring, skb);

	if (unlikely(err == -ENOKEY)) {
@@ -1333,7 +1334,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb) 
	if ((free_slots(ring) < SLOTS_PER_PACKET) ||

	    should_inject_overflow(ring)) {

		/* This TX ring is full. */

		ieee80211_stop_queue(dev->wl->hw, info->queue);

		ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));

		ring->stopped = 1;

		if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {

			b43dbg(dev->wl, "Stopped TX ring %d\n", ring->index);

drivers/net/wireless/b43/pio.c

+4 −4
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) 
		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);

	} else {

		/* Decide by priority where to put this frame. */

		q = select_queue_by_priority(dev, info->queue);

		q = select_queue_by_priority(dev, skb_get_queue_mapping(skb));

	}



	spin_lock_irqsave(&q->lock, flags);
@@ -532,7 +532,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) 
	if (total_len > (q->buffer_size - q->buffer_used)) {

		/* Not enough memory on the queue. */

		err = -EBUSY;

		ieee80211_stop_queue(dev->wl->hw, info->queue);

		ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));

		q->stopped = 1;

		goto out_unlock;

	}
@@ -540,7 +540,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) 
	/* Assign the queue number to the ring (if not already done before)

	 * so TX status handling can use it. The mac80211-queue to b43-queue

	 * mapping is static, so we don't need to store it per frame. */

	q->queue_prio = info->queue;

	q->queue_prio = skb_get_queue_mapping(skb);



	err = pio_tx_frame(q, skb);

	if (unlikely(err == -ENOKEY)) {
@@ -560,7 +560,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) 
	if (((q->buffer_size - q->buffer_used) < roundup(2 + 2 + 6, 4)) ||

	    (q->free_packet_slots == 0)) {

		/* The queue is full. */

		ieee80211_stop_queue(dev->wl->hw, info->queue);

		ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));

		q->stopped = 1;

	}

drivers/net/wireless/b43legacy/dma.c

+1 −2
Original line number Diff line number Diff line
@@ -1325,11 +1325,10 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev, 
		     struct sk_buff *skb)

{

	struct b43legacy_dmaring *ring;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	int err = 0;

	unsigned long flags;



	ring = priority_to_txring(dev, info->queue);

	ring = priority_to_txring(dev, skb_get_queue_mapping(skb));

	spin_lock_irqsave(&ring->lock, flags);

	B43legacy_WARN_ON(!ring->tx);

	if (unlikely(free_slots(ring) < SLOTS_PER_PACKET)) {

drivers/net/wireless/iwlwifi/iwl-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct iwl_tfd_frame *tfd;

	u32 *control_flags;

	int txq_id = info->queue;

	int txq_id = skb_get_queue_mapping(skb);

	struct iwl_tx_queue *txq = NULL;

	struct iwl_queue *q = NULL;

	dma_addr_t phys_addr;
@@ -917,7 +917,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
			spin_unlock_irqrestore(&priv->lock, flags);

		}



		ieee80211_stop_queue(priv->hw, info->queue);

		ieee80211_stop_queue(priv->hw, skb_get_queue_mapping(skb));

	}



	return 0;