aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/ethtool.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-23 11:06:30 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-24 13:58:53 -0500
commiteb50c0d67fe3c5513c717c2dee6d9771c51be703 (patch)
tree449f56f6c8fac242be9ac57663ad98128524b404 /drivers/net/sfc/ethtool.c
parente775fb93a880d218ce0b3fd405278dd78f86c405 (diff)
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.c4
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)
539{ 539{
540 struct efx_nic *efx = netdev_priv(net_dev); 540 struct efx_nic *efx = netdev_priv(net_dev);
541 541
542 return efx->link_up; 542 return efx->link_state.up;
543} 543}
544 544
545static int efx_ethtool_get_eeprom_len(struct net_device *net_dev) 545static 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,
699 if (EFX_WORKAROUND_11482(efx) && reset) { 699 if (EFX_WORKAROUND_11482(efx) && reset) {
700 if (falcon_rev(efx) >= FALCON_REV_B0) { 700 if (falcon_rev(efx) >= FALCON_REV_B0) {
701 /* Recover by resetting the EM block */ 701 /* Recover by resetting the EM block */
702 if (efx->link_up) 702 if (efx->link_state.up)
703 falcon_drain_tx_fifo(efx); 703 falcon_drain_tx_fifo(efx);
704 } else { 704 } else {
705 /* Schedule a reset to recover */ 705 /* Schedule a reset to recover */