netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarek Poplawski <jarkao2@gmail.com>
To: Mike McCormack <mikem@ring3k.org>
Cc: Stephen Hemminger <shemminger@vyatta.com>,
	netdev@vger.kernel.org, flyboy@gmail.com, dhazelton@enter.net,
	mbreuer@majjas.com
Subject: Re: [PATCH] sky2: Lock transmit queue while disabling device
Date: Fri, 1 Jan 2010 19:31:55 +0100	[thread overview]
Message-ID: <20100101183155.GA8519@del.dom.local> (raw)
In-Reply-To: <4B3D38FB.40105@ring3k.org>

On Fri, Jan 01, 2010 at 08:51:23AM +0900, Mike McCormack wrote:
> Another way to solve the problem would be to take the transmit lock in 
> netif_device_detach() to make sure that any in progress transmits have
> completed before returning.

Yes, it seems this lock might be needed around this place, but I'd
like to check another idea: if it's not about awakening too early.
Berck, could you try this patch?

Thanks,
Jarek P.
---

 drivers/net/sky2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1c01b96..31f1629 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1844,7 +1844,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
 	sky2->tx_cons = idx;
 	smp_mb();
 
-	if (tx_avail(sky2) > MAX_SKB_TX_LE + 4)
+	if (tx_avail(sky2) > MAX_SKB_TX_LE + 4 && netif_device_present(dev))
 		netif_wake_queue(dev);
 }
 

  parent reply	other threads:[~2010-01-01 18:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-31 10:55 [PATCH] sky2: Lock transmit queue while disabling device Mike McCormack
2009-12-31 15:58 ` Michael Breuer
2009-12-31 16:15   ` Daniel Hazelton
2009-12-31 16:33 ` Berck Nash
2009-12-31 18:51 ` Jarek Poplawski
2009-12-31 23:51   ` Mike McCormack
2010-01-01  3:06     ` Berck E. Nash
2010-01-01  6:42       ` Stephen Hemminger
2010-01-01 18:31     ` Jarek Poplawski [this message]
2010-01-04  2:44       ` Berck E. Nash
2010-01-04 13:49         ` [PATCH] sky2: Fix oops in sky2_xmit_frame() after TX timeout Jarek Poplawski
2010-01-04 18:26           ` Stephen Hemminger
2010-01-04 18:48             ` [PATCH v2] " Jarek Poplawski
2010-01-07  4:27 ` [PATCH] sky2: Lock transmit queue while disabling device David Miller
2010-01-07  6:35   ` Jarek Poplawski
2010-01-07  8:01     ` David Miller
2010-01-07  8:15       ` Jarek Poplawski
2010-01-07  8:19         ` David Miller
2010-01-07 13:48           ` Stephen Hemminger
2010-01-07 18:08           ` Stephen Hemminger

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=20100101183155.GA8519@del.dom.local \
    --to=jarkao2@gmail.com \
    --cc=dhazelton@enter.net \
    --cc=flyboy@gmail.com \
    --cc=mbreuer@majjas.com \
    --cc=mikem@ring3k.org \
    --cc=netdev@vger.kernel.org \
    --cc=shemminger@vyatta.com \
    /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;
as well as URLs for NNTP newsgroup(s).