diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 17:11:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-27 00:59:40 +0100 |
| commit | fe75820b99ff2de713de23252432f0f9d0ca1d35 (patch) | |
| tree | ca03ef31a0e3a5352628038db11c5c61e9341da1 /drivers/net/sfc | |
| parent | sfc: Split MAC stats DMA initiation and completion (diff) | |
| download | linux-fe75820b99ff2de713de23252432f0f9d0ca1d35.tar.xz linux-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 '')
| -rw-r--r-- | drivers/net/sfc/efx.c | 11 | ||||
| -rw-r--r-- | drivers/net/sfc/falcon.c | 15 | ||||
| -rw-r--r-- | drivers/net/sfc/falcon.h | 1 |
3 files changed, 17 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); diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 3ab2daff6b48..c43c5e6f077b 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -2612,6 +2612,21 @@ fail5: return rc; } +void falcon_monitor(struct efx_nic *efx) +{ + int rc; + + 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); +} + /* Zeroes out the SRAM contents. This routine must be called in * process context and is allowed to sleep. */ diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 61fab0a00cc3..05e51c2a6d8a 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h @@ -158,6 +158,7 @@ extern int falcon_probe_nic(struct efx_nic *efx); extern int falcon_init_nic(struct efx_nic *efx); extern int falcon_flush_queues(struct efx_nic *efx); extern int falcon_reset_hw(struct efx_nic *efx, enum reset_type method); +extern void falcon_monitor(struct efx_nic *efx); extern void falcon_remove_nic(struct efx_nic *efx); extern void falcon_update_nic_stats(struct efx_nic *efx); extern void falcon_start_nic_stats(struct efx_nic *efx); |