diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-09-27 21:53:40 +0200 |
|---|---|---|
| committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-09-27 21:53:40 +0200 |
| commit | 2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7 (patch) | |
| tree | 96fb0831a264603f4f0ee7bb8f7f19e23252c2e0 /drivers/net/e1000 | |
| parent | e1000: add multicast stats counters (diff) | |
| download | linux-2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7.tar.xz linux-2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7.zip | |
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) ADVERTISED_FIBRE | ADVERTISED_Autoneg; else - hw->autoneg_advertised = ADVERTISED_10baseT_Half | - ADVERTISED_10baseT_Full | - ADVERTISED_100baseT_Half | - ADVERTISED_100baseT_Full | - ADVERTISED_1000baseT_Full| - ADVERTISED_Autoneg | - ADVERTISED_TP; + hw->autoneg_advertised = ecmd->advertising | + ADVERTISED_TP | + ADVERTISED_Autoneg; ecmd->advertising = hw->autoneg_advertised; } else if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) { |