mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rusty Russell <rusty@rustcorp.com.au>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
	Larry Finger <Larry.Finger@lwfinger.net>
Subject: linux-next: manual merge of the wireless-next tree with the net-next tree
Date: Thu, 5 Jan 2012 14:04:05 +1100	[thread overview]
Message-ID: <20120105140405.92816482d364abfcf3854d74@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2226 bytes --]

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@canb.auug.org.au

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-01-05  3:04 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-05  3:04 Stephen Rothwell [this message]
2012-01-05  3:12 ` Larry Finger
2012-01-05  3:30   ` David Miller
2012-01-05  3:45   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-10-11  1:10 Stephen Rothwell
2014-03-07  1:07 Stephen Rothwell
2013-09-27  3:19 Stephen Rothwell
2013-06-27  4:23 Stephen Rothwell
2013-06-27  7:34 ` Berg, Johannes
2013-06-04  2:33 Stephen Rothwell
2013-02-11  2:33 Stephen Rothwell
2013-02-11  2:58 ` Joe Perches
2013-02-11  6:47   ` Luciano Coelho
2013-02-11  7:40     ` Stephen Rothwell
2013-02-11  7:53       ` Luciano Coelho
2012-06-28  2:40 Stephen Rothwell
2012-05-03  1:31 Stephen Rothwell
2012-05-03  1:35 ` David Miller
2012-04-24  2:48 Stephen Rothwell
2012-04-24  5:07 ` Grumbach, Emmanuel
2012-04-16  2:49 Stephen Rothwell
2012-04-16  2:49 Stephen Rothwell
2012-04-16  2:48 Stephen Rothwell
2012-04-13  2:41 Stephen Rothwell
2012-04-13  2:49 ` Stephen Rothwell
2012-04-13  2:30 Stephen Rothwell
2012-04-13  2:51 ` Stephen Rothwell
2012-04-11  2:56 Stephen Rothwell
2012-04-10  1:32 Stephen Rothwell
2012-03-16  1:58 Stephen Rothwell
2012-02-01  2:39 Stephen Rothwell
2011-12-21 11:59 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120105140405.92816482d364abfcf3854d74@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Larry.Finger@lwfinger.net \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®