aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/efx.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-03-04 04:52:52 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-04 20:40:22 -0500
commit115122afc5e34499a0edfd2b057e9c352fa7c78f (patch)
treed0c7b0a69ca579749a4ee6a2d252d24969b68201 /drivers/net/sfc/efx.c
parenta7ef59332b33cb1924ea76cce2aa620a32bb0d7a (diff)
sfc: Clean up properly on reset failure paths
If MAC switching fails, stop the port properly. If PHY reinitialisation fails, clear the port_initialized flag. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r--drivers/net/sfc/efx.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 45df110f8331..8fa68d82c022 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -557,6 +557,8 @@ static void efx_link_status_changed(struct efx_nic *efx)
557 557
558} 558}
559 559
560static void efx_fini_port(struct efx_nic *efx);
561
560/* This call reinitialises the MAC to pick up new PHY settings. The 562/* This call reinitialises the MAC to pick up new PHY settings. The
561 * caller must hold the mac_lock */ 563 * caller must hold the mac_lock */
562void __efx_reconfigure_port(struct efx_nic *efx) 564void __efx_reconfigure_port(struct efx_nic *efx)
@@ -592,8 +594,8 @@ void __efx_reconfigure_port(struct efx_nic *efx)
592 594
593fail: 595fail:
594 EFX_ERR(efx, "failed to reconfigure MAC\n"); 596 EFX_ERR(efx, "failed to reconfigure MAC\n");
595 efx->phy_op->fini(efx); 597 efx->port_enabled = false;
596 efx->port_initialized = false; 598 efx_fini_port(efx);
597} 599}
598 600
599/* Reinitialise the MAC to pick up new PHY settings, even if the port is 601/* Reinitialise the MAC to pick up new PHY settings, even if the port is
@@ -1667,7 +1669,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method,
1667 rc = efx->phy_op->init(efx); 1669 rc = efx->phy_op->init(efx);
1668 if (rc) 1670 if (rc)
1669 ok = false; 1671 ok = false;
1670 } else 1672 }
1673 if (!ok)
1671 efx->port_initialized = false; 1674 efx->port_initialized = false;
1672 } 1675 }
1673 1676