Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Woodhouse , Francois Romieu , "David S. Miller" , Luis Henriques Subject: [PATCH 3.4 12/39] 8139cp: re-enable interrupts after tx timeout Date: Tue, 26 Nov 2013 16:56:36 -0800 Message-Id: <20131127005619.897122799@linuxfoundation.org> In-Reply-To: <20131127005619.011763867@linuxfoundation.org> References: <20131127005619.011763867@linuxfoundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Woodhouse 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: Luis Henriques Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/8139cp.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -1232,6 +1232,7 @@ static void cp_tx_timeout(struct net_dev cp_clean_rings(cp); rc = cp_init_rings(cp); cp_start_hw(cp); + cp_enable_irq(cp); netif_wake_queue(dev);