diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-11-27 14:01:21 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-11-27 14:06:45 -0500 |
| commit | 0970aa2a8138400a2603f1bbfff27ced8168a984 (patch) | |
| tree | 00038ddf8c4a1b2c1e81549ce79b336f34f89247 /8139cp-re-enable-interrupts-after-tx-timeout.patch | |
| parent | 739840a50514d76fcb3c19732ff899b9270284a6 (diff) | |
| download | kernel-0970aa2a8138400a2603f1bbfff27ced8168a984.tar.gz kernel-0970aa2a8138400a2603f1bbfff27ced8168a984.tar.xz kernel-0970aa2a8138400a2603f1bbfff27ced8168a984.zip | |
Update patches for 8139cp issues from David Woodhouse (rhbz 851278)
Diffstat (limited to '8139cp-re-enable-interrupts-after-tx-timeout.patch')
| -rw-r--r-- | 8139cp-re-enable-interrupts-after-tx-timeout.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/8139cp-re-enable-interrupts-after-tx-timeout.patch b/8139cp-re-enable-interrupts-after-tx-timeout.patch new file mode 100644 index 000000000..c0196188e --- /dev/null +++ b/8139cp-re-enable-interrupts-after-tx-timeout.patch @@ -0,0 +1,29 @@ +From 01ffc0a7f1c1801a2354719dedbc32aff45b987d Mon Sep 17 00:00:00 2001 +From: David Woodhouse <dwmw2@infradead.org> +Date: Sat, 24 Nov 2012 12:11:21 +0000 +Subject: [PATCH] 8139cp: re-enable interrupts after tx timeout + +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> +--- + drivers/net/ethernet/realtek/8139cp.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c +index 3de318d..6cb96b4 100644 +--- a/drivers/net/ethernet/realtek/8139cp.c ++++ b/drivers/net/ethernet/realtek/8139cp.c +@@ -1219,6 +1219,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); + +-- +1.7.6.5 + |