diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-09-27 15:53:40 -0400 |
|---|---|---|
| committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-09-27 15:53:40 -0400 |
| commit | 2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7 (patch) | |
| tree | 96fb0831a264603f4f0ee7bb8f7f19e23252c2e0 /drivers/net/e1000 | |
| parent | 49559854c9ea6d6950631d558d33faff49fa74f3 (diff) | |
e1000: allow ethtool to pass arbitrary speed advertisment
With a patch, ethtool can now signify the driver to advertise more
than just a single speed/duplex setting. This allows you to tell the
card to advertise in 10/100 in any speed if you don't have a gigabit
switch for instance.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 9791b8a1a096..5edf8a099ceb 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
| @@ -211,13 +211,9 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | |||
| 211 | ADVERTISED_FIBRE | | 211 | ADVERTISED_FIBRE | |
| 212 | ADVERTISED_Autoneg; | 212 | ADVERTISED_Autoneg; |
| 213 | else | 213 | else |
| 214 | hw->autoneg_advertised = ADVERTISED_10baseT_Half | | 214 | hw->autoneg_advertised = ecmd->advertising | |
| 215 | ADVERTISED_10baseT_Full | | 215 | ADVERTISED_TP | |
| 216 | ADVERTISED_100baseT_Half | | 216 | ADVERTISED_Autoneg; |
| 217 | ADVERTISED_100baseT_Full | | ||
| 218 | ADVERTISED_1000baseT_Full| | ||
| 219 | ADVERTISED_Autoneg | | ||
| 220 | ADVERTISED_TP; | ||
| 221 | ecmd->advertising = hw->autoneg_advertised; | 217 | ecmd->advertising = hw->autoneg_advertised; |
| 222 | } else | 218 | } else |
| 223 | if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) { | 219 | if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) { |