diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 13:47:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-03 09:08:09 -0800 |
| commit | cef68bde74f083d83c18ce870ed834e82ee0ae5a (patch) | |
| tree | 430ee1d641b6d4f6c54c120fc500de6f9dbee797 /drivers/net/sfc/falcon_boards.c | |
| parent | 40641ed93cd53561f7d53b5fd5ed656b35f3aabd (diff) | |
| download | op-kernel-dev-cef68bde74f083d83c18ce870ed834e82ee0ae5a.zip op-kernel-dev-cef68bde74f083d83c18ce870ed834e82ee0ae5a.tar.gz | |
sfc: Move xmac_poll_required into struct falcon_nic_data
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon_boards.c')
| -rw-r--r-- | drivers/net/sfc/falcon_boards.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c index a6fc5ce..2dd16f0 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c @@ -415,10 +415,11 @@ static void sfe4001_fini(struct efx_nic *efx) static int sfe4001_check_hw(struct efx_nic *efx) { + struct falcon_nic_data *nic_data = efx->nic_data; s32 status; /* If XAUI link is up then do not monitor */ - if (EFX_WORKAROUND_7884(efx) && !efx->xmac_poll_required) + if (EFX_WORKAROUND_7884(efx) && !nic_data->xmac_poll_required) return 0; /* Check the powered status of the PHY. Lack of power implies that |
