]> git.hungrycats.org Git - linux/commitdiff
8139cp: re-enable interrupts after tx timeout
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 24 Nov 2012 12:11:21 +0000 (12:11 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Nov 2013 18:50:32 +0000 (10:50 -0800)
commit 01ffc0a7f1c1801a2354719dedbc32aff45b987d upstream.

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

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/realtek/8139cp.c

index 1b4404725b8c88cc3e7e82973a15ad814011f30c..effb3b71ce75e10fa2def51e2a6357dd56db4c0b 100644 (file)
@@ -1232,6 +1232,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);