diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 01:00:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 01:00:17 -0500 |
commit | e6fa2eb789f49dc51a20d3db0d410bc8158abb43 (patch) | |
tree | 4b61712a720b2f90b47fe69127a76f258e3322f8 /drivers/net/sfc/ethtool.c | |
parent | 766ca0fa6bf1600bdf4bc7726c74f14c8455c6b8 (diff) |
sfc: Add support for Solarflare 10Xpress SFT9001
Add type codes for the new PHY and rename the SFX7101 type code.
Add definition of clause 22 extension MMD.
Adapt the 10Xpress SFX7101 code to support the SFT9001 as well.
Clean up register definitions.
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 0e81af6d8348..aad0d1b36e1c 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
@@ -219,6 +219,9 @@ int efx_ethtool_set_settings(struct net_device *net_dev, | |||
219 | struct efx_nic *efx = netdev_priv(net_dev); | 219 | struct efx_nic *efx = netdev_priv(net_dev); |
220 | int rc; | 220 | int rc; |
221 | 221 | ||
222 | if (EFX_WORKAROUND_13963(efx) && !ecmd->autoneg) | ||
223 | return -EINVAL; | ||
224 | |||
222 | /* Falcon GMAC does not support 1000Mbps HD */ | 225 | /* Falcon GMAC does not support 1000Mbps HD */ |
223 | if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { | 226 | if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { |
224 | EFX_LOG(efx, "rejecting unsupported 1000Mbps HD" | 227 | EFX_LOG(efx, "rejecting unsupported 1000Mbps HD" |