git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
igb
/
igb_main.c
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);
}