diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-02-17 18:51:15 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2011-02-18 20:05:56 +0000 |
| commit | 1f4ae804e6bef1fa84193a51c61109aa420257c8 (patch) | |
| tree | d9168caf97f4a5ca7747bce0a987e5c160d2c007 | |
| parent | b031cf012b66d16211cb6fb22f609dd4fbb317e0 (diff) | |
| download | ethtool-1f4ae804e6bef1fa84193a51c61109aa420257c8.tar.gz | |
ethtool: Don't silently ignore speed/duplex when autoneg is on
When autonegotiation is enabled, drivers must determine link speed and
duplex through the autonegotiation process and will generally ignore
the speed and duplex specified in struct ethtool_cmd. Currently, if
the user specifies autoneg on but does not specify the advertising
mask then:
- If the user specifies a recognised combination of speed and duplex,
we set the advertising mask to the flag for that mode. (Currently
only one mode is recognised per combination of speed and duplex.)
- Otherwise, we advertise all recognised and supported modes.
But we should also set the advertising mask if autoneg is *already*
on. Also, we should be able to limit the advertised modes separately
by speed and duplex. For now, we just warn if we fail to do that.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
| -rw-r--r-- | ethtool.c | 45 |
1 files changed, 31 insertions, 14 deletions
@@ -1126,7 +1126,7 @@ static void parse_cmdline(int argc, char **argp) } } - if ((autoneg_wanted == AUTONEG_ENABLE) && (advertising_wanted < 0)) { + if (advertising_wanted < 0) { if (speed_wanted == SPEED_10 && duplex_wanted == DUPLEX_HALF) advertising_wanted = ADVERTISED_10baseT_Half; else if (speed_wanted == SPEED_10 && @@ -2528,19 +2528,36 @@ static int do_sset(int fd, struct ifreq *ifr) ecmd.phy_address = phyad_wanted; if (xcvr_wanted != -1) ecmd.transceiver = xcvr_wanted; - if (advertising_wanted != -1) { - if (advertising_wanted == 0) - ecmd.advertising = ecmd.supported & - (ADVERTISED_10baseT_Half | - ADVERTISED_10baseT_Full | - ADVERTISED_100baseT_Half | - ADVERTISED_100baseT_Full | - ADVERTISED_1000baseT_Half | - ADVERTISED_1000baseT_Full | - ADVERTISED_2500baseX_Full | - ADVERTISED_10000baseT_Full); - else - ecmd.advertising = advertising_wanted; + /* XXX If the user specified speed or duplex + * then we should mask the advertised modes + * accordingly. For now, warn that we aren't + * doing that. + */ + if ((speed_wanted != -1 || duplex_wanted != -1) && + ecmd.autoneg && advertising_wanted == 0) { + fprintf(stderr, "Cannot advertise"); + if (speed_wanted >= 0) + fprintf(stderr, " speed %d", + speed_wanted); + if (duplex_wanted >= 0) + fprintf(stderr, " duplex %s", + duplex_wanted ? + "full" : "half"); + fprintf(stderr, "\n"); + } + if (autoneg_wanted == AUTONEG_ENABLE && + advertising_wanted == 0) { + ecmd.advertising = ecmd.supported & + (ADVERTISED_10baseT_Half | + ADVERTISED_10baseT_Full | + ADVERTISED_100baseT_Half | + ADVERTISED_100baseT_Full | + ADVERTISED_1000baseT_Half | + ADVERTISED_1000baseT_Full | + ADVERTISED_2500baseX_Full | + ADVERTISED_10000baseT_Full); + } else if (advertising_wanted > 0) { + ecmd.advertising = advertising_wanted; } /* Try to perform the update. */ |