diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/net/sfc/ethtool.c | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/net/sfc/ethtool.c')
| -rw-r--r-- | drivers/net/sfc/ethtool.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 53d259e90187..7b5924c039b3 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
| @@ -219,9 +219,6 @@ 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 | |||
| 225 | /* Falcon GMAC does not support 1000Mbps HD */ | 222 | /* Falcon GMAC does not support 1000Mbps HD */ |
| 226 | if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { | 223 | if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { |
| 227 | EFX_LOG(efx, "rejecting unsupported 1000Mbps HD" | 224 | EFX_LOG(efx, "rejecting unsupported 1000Mbps HD" |