linux-next: manual merge of the wireless-next tree with the net-next tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/b43legacy/dma.c between commit 3db1cd5c05f3 ("net:
fix assignment of 0/1 to bool variables") from the net-next tree and
commit 5d07a3d62f63 ("b43legacy: Avoid packet losses in the dma worker
code") from the wireless-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/wireless/b43legacy/dma.c
index 1ee31c5,aebef75..0000000
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@@ -1186,8 -1180,10 +1180,10 @@@ int b43legacy_dma_tx(struct b43legacy_w
  	if ((free_slots(ring) < SLOTS_PER_PACKET) ||
  	    should_inject_overflow(ring)) {
  		/* This TX ring is full. */
- 		ieee80211_stop_queue(dev->wl->hw, txring_to_priority(ring));
+ 		unsigned int skb_mapping = skb_get_queue_mapping(skb);
+ 		ieee80211_stop_queue(dev->wl->hw, skb_mapping);
+ 		dev->wl->tx_queue_stopped[skb_mapping] = 1;
 -		ring->stopped = 1;
 +		ring->stopped = true;
  		if (b43legacy_debug(dev, B43legacy_DBG_DMAVERBOSE))
  			b43legacydbg(dev->wl, "Stopped TX ring %d\n",
  			       ring->index);
@@@ -1285,14 -1293,21 +1293,21 @@@ void b43legacy_dma_handle_txstatus(stru
  	dev->stats.last_tx = jiffies;
  	if (ring->stopped) {
  		B43legacy_WARN_ON(free_slots(ring) < SLOTS_PER_PACKET);
- 		ieee80211_wake_queue(dev->wl->hw, txring_to_priority(ring));
 -		ring->stopped = 0;
 +		ring->stopped = false;
+ 	}
+ 
+ 	if (dev->wl->tx_queue_stopped[ring->queue_prio]) {
+ 		dev->wl->tx_queue_stopped[ring->queue_prio] = 0;
+ 	} else {
+ 		/* If the driver queue is running wake the corresponding
+ 		 * mac80211 queue. */
+ 		ieee80211_wake_queue(dev->wl->hw, ring->queue_prio);
  		if (b43legacy_debug(dev, B43legacy_DBG_DMAVERBOSE))
  			b43legacydbg(dev->wl, "Woke up TX ring %d\n",
- 			       ring->index);
+ 				     ring->index);
  	}
- 
- 	spin_unlock(&ring->lock);
+ 	/* Add work to the queue. */
+ 	ieee80211_queue_work(dev->wl->hw, &dev->wl->tx_work);
  }
  
  static void dma_rx(struct b43legacy_dmaring *ring,

Attachment: pgpJL0lwSTGZr.pgp
Description: PGP signature