projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
tg3.c
diff --git
a/drivers/net/ethernet/broadcom/tg3.c
b/drivers/net/ethernet/broadcom/tg3.c
index
2726f03
..
a927a73
100644
(file)
--- a/
drivers/net/ethernet/broadcom/tg3.c
+++ b/
drivers/net/ethernet/broadcom/tg3.c
@@
-18134,14
+18134,14
@@
static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
rtnl_lock();
rtnl_lock();
- /* We needn't recover from permanent error */
- if (state == pci_channel_io_frozen)
- tp->pcierr_recovery = true;
-
/* We probably don't have netdev yet */
if (!netdev || !netif_running(netdev))
goto done;
/* We probably don't have netdev yet */
if (!netdev || !netif_running(netdev))
goto done;
+ /* We needn't recover from permanent error */
+ if (state == pci_channel_io_frozen)
+ tp->pcierr_recovery = true;
+
tg3_phy_stop(tp);
tg3_netif_stop(tp);
tg3_phy_stop(tp);
tg3_netif_stop(tp);
@@
-18238,7
+18238,7
@@
static void tg3_io_resume(struct pci_dev *pdev)
rtnl_lock();
rtnl_lock();
- if (!netif_running(netdev))
+ if (!net
dev || !net
if_running(netdev))
goto done;
tg3_full_lock(tp, 0);
goto done;
tg3_full_lock(tp, 0);