diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-03 03:17:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-03 04:20:41 +0200 |
| commit | b50afd203a5ef1998c18d6519ad2b2c546d6af22 (patch) | |
| tree | 608e6845e78a4ffe623c7cdf6581e29e2d9be0a9 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | net: Use ns_capable_noaudit() when determining net sysctl permissions (diff) | |
| parent | Linux 4.8 (diff) | |
| download | linux-b50afd203a5ef1998c18d6519ad2b2c546d6af22.tar.xz linux-b50afd203a5ef1998c18d6519ad2b2c546d6af22.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes. Nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 2726f032f2d4..a927a730da10 100644 --- 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(); - /* 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 needn't recover from permanent error */ + if (state == pci_channel_io_frozen) + tp->pcierr_recovery = true; + tg3_phy_stop(tp); tg3_netif_stop(tp); @@ -18238,7 +18238,7 @@ static void tg3_io_resume(struct pci_dev *pdev) rtnl_lock(); - if (!netif_running(netdev)) + if (!netdev || !netif_running(netdev)) goto done; tg3_full_lock(tp, 0); |