From patchwork Fri Nov 22 11:35:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 293415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4E4412C00E2 for ; Fri, 22 Nov 2013 22:35:34 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vjp1D-0005v9-KX; Fri, 22 Nov 2013 11:35:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vjp13-0005sC-Ja for kernel-team@lists.ubuntu.com; Fri, 22 Nov 2013 11:35:17 +0000 Received: from bl20-223-77.dsl.telepac.pt ([2.81.223.77] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Vjp0z-0005fI-QR; Fri, 22 Nov 2013 11:35:14 +0000 From: Luis Henriques To: David Woodhouse Subject: [3.5.y.z extended stable] Patch "8139cp: re-enable interrupts after tx timeout" has been added to staging queue Date: Fri, 22 Nov 2013 11:35:12 +0000 Message-Id: <1385120112-13274-1-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 X-Extended-Stable: 3.5 Cc: David Woodhouse , Nathan Williams , kernel-team@lists.ubuntu.com, Francois Romieu , "David S. Miller" X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled 8139cp: re-enable interrupts after tx timeout to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 95b9b000300f463c6c7511f57dc5e62f6fe4f83b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 24 Nov 2012 12:11:21 +0000 Subject: 8139cp: re-enable interrupts after tx timeout commit 01ffc0a7f1c1801a2354719dedbc32aff45b987d upstream. Recovery doesn't work too well if we leave interrupts disabled... Signed-off-by: David Woodhouse Acked-by: Francois Romieu Signed-off-by: David S. Miller Cc: Nathan Williams Signed-off-by: Luis Henriques --- drivers/net/ethernet/realtek/8139cp.c | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.2 diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index efd3e34..9ac8801 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -1252,6 +1252,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);