diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 16:11:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-26 15:59:40 -0800 |
| commit | fe75820b99ff2de713de23252432f0f9d0ca1d35 (patch) | |
| tree | ca03ef31a0e3a5352628038db11c5c61e9341da1 /drivers/net/sfc/efx.c | |
| parent | 55edc6e6ff728681ebc10d418222740705376664 (diff) | |
| download | lwn-fe75820b99ff2de713de23252432f0f9d0ca1d35.tar.gz lwn-fe75820b99ff2de713de23252432f0f9d0ca1d35.zip | |
sfc: Move Falcon board/PHY/MAC monitoring code to falcon.c
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.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 41ca5dbb4c44..d17cea9f4e88 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1293,7 +1293,6 @@ static void efx_monitor(struct work_struct *data) { struct efx_nic *efx = container_of(data, struct efx_nic, monitor_work.work); - int rc; EFX_TRACE(efx, "hardware monitor executing on CPU %d\n", raw_smp_processor_id()); @@ -1305,15 +1304,7 @@ static void efx_monitor(struct work_struct *data) goto out_requeue; if (!efx->port_enabled) goto out_unlock; - rc = falcon_board(efx)->type->monitor(efx); - if (rc) { - EFX_ERR(efx, "Board sensor %s; shutting down PHY\n", - (rc == -ERANGE) ? "reported fault" : "failed"); - efx->phy_mode |= PHY_MODE_LOW_POWER; - falcon_sim_phy_event(efx); - } - efx->phy_op->poll(efx); - efx->mac_op->poll(efx); + falcon_monitor(efx); out_unlock: mutex_unlock(&efx->mac_lock); |