projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f4a0e4
)
igb: fix EEH recovery during reset on PPC
author
Jeff Kirsher
<jeffrey.t.kirsher@intel.com>
Wed, 25 Jun 2008 00:01:15 +0000
(17:01 -0700)
committer
Jeff Garzik
<jgarzik@redhat.com>
Fri, 27 Jun 2008 05:27:47 +0000
(
01:27
-0400)
EEH is not recovering in a reasonable amount of time on PPC during
igb_down().
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/igb/igb_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/igb/igb_main.c
b/drivers/net/igb/igb_main.c
index
ae398f0
..
e79a26a
100644
(file)
--- a/
drivers/net/igb/igb_main.c
+++ b/
drivers/net/igb/igb_main.c
@@
-718,7
+718,8
@@
void igb_down(struct igb_adapter *adapter)
adapter->link_speed = 0;
adapter->link_duplex = 0;
- igb_reset(adapter);
+ if (!pci_channel_offline(adapter->pdev))
+ igb_reset(adapter);
igb_clean_all_tx_rings(adapter);
igb_clean_all_rx_rings(adapter);
}