diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-23 16:06:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 10:58:53 -0800 |
| commit | eb50c0d67fe3c5513c717c2dee6d9771c51be703 (patch) | |
| tree | 449f56f6c8fac242be9ac57663ad98128524b404 /drivers/net/sfc/ethtool.c | |
| parent | e775fb93a880d218ce0b3fd405278dd78f86c405 (diff) | |
| download | blackbird-op-linux-eb50c0d67fe3c5513c717c2dee6d9771c51be703.tar.gz blackbird-op-linux-eb50c0d67fe3c5513c717c2dee6d9771c51be703.zip | |
sfc: Gather link state fields in struct efx_nic into new struct efx_link_state
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/ethtool.c')
| -rw-r--r-- | drivers/net/sfc/ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index bb415326c739..eb12f201ab00 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c @@ -539,7 +539,7 @@ static u32 efx_ethtool_get_link(struct net_device *net_dev) { struct efx_nic *efx = netdev_priv(net_dev); - return efx->link_up; + return efx->link_state.up; } static int efx_ethtool_get_eeprom_len(struct net_device *net_dev) @@ -699,7 +699,7 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev, if (EFX_WORKAROUND_11482(efx) && reset) { if (falcon_rev(efx) >= FALCON_REV_B0) { /* Recover by resetting the EM block */ - if (efx->link_up) + if (efx->link_state.up) falcon_drain_tx_fifo(efx); } else { /* Schedule a reset to recover */ |
