netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Woodhouse <dwmw2@infradead.org>
To: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org, jasowang@redhat.com, gilboad@gmail.com,
	jgarzik@redhat.com
Subject: [PATCH] 8139cp: re-enable interrupts after tx timeout
Date: Sat, 24 Nov 2012 22:11:21 +0000	[thread overview]
Message-ID: <1353795081.26346.287.camel@shinybook.infradead.org> (raw)
In-Reply-To: <20121124213348.GA8313@electric-eye.fr.zoreil.com>

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

Recovery doesn't work too well if we leave interrupts disabled...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
For stable too, I suppose.

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 1c81825..ad6afc3 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -1192,6 +1192,7 @@ static void cp_tx_timeout(struct net_device *dev)
 	cp_clean_rings(cp);
 	rc = cp_init_rings(cp);
 	cp_start_hw(cp);
+	cp_enable_irq(cp);
 
 	netif_wake_queue(dev);
 

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation




[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]

  reply	other threads:[~2012-11-24 22:11 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-24 18:39 8139cp TX stall, timeout, failed recovery David Woodhouse
2012-11-24 21:33 ` Francois Romieu
2012-11-24 22:11   ` David Woodhouse [this message]
2012-11-24 22:58     ` [PATCH] 8139cp: re-enable interrupts after tx timeout Francois Romieu
2012-11-24 23:27       ` David Woodhouse
2012-11-25 22:43         ` Francois Romieu
2012-11-25 20:57       ` David Miller
2012-11-24 21:39 ` 8139cp TX stall, timeout, failed recovery David Woodhouse

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=1353795081.26346.287.camel@shinybook.infradead.org \
    --to=dwmw2@infradead.org \
    --cc=gilboad@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=jgarzik@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=romieu@fr.zoreil.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).