Skip to contentSkip to conversation

tg3: fix ethtool autonegotiate flags

PATCH Applied Andy Gospodarek 3 participants 4 messages Oct 2, 2007 – Oct 8, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tg3: fix ethtool autonegotiate flags

I recently noticed that when calling:

# ethtool -s eth0 autoneg on

on a 5722 (though I'm sure it's not specific to that card) that subsequent checks of the cards status looked like this:

# ethtool eth0
Settings for eth0:
        Supported ports: [ MII ]
        Supported link modes:   10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Half 1000baseT/Full
        Supports auto-negotiation: Yes
        Advertised link modes:  10baseT/Half 10baseT/Full
                                100baseT/Half 100baseT/Full
                                1000baseT/Half 1000baseT/Full
        Advertised auto-negotiation: No        <---- This seems odd?!?
        Speed: 1000Mb/s
        Duplex: Full
        Port: Twisted Pair
        PHYAD: 1
        Transceiver: internal
        Auto-negotiation: on
        Supports Wake-on: g
        Wake-on: d
        Current message level: 0x000000ff (255)
        Link detected: yes

I noticed that the following commit:

commit 3600d918d870456ea8e7bb9d47f327de5c20f3d6

Author: Michael Chan <[email protected]>
Date:   Thu Dec 7 00:21:48 2006 -0800

[TG3]: Allow partial speed advertisement.

Honor the advertisement bitmask from ethtool. We used to always advertise the full capability when autoneg was set to on.

changed things around so that ethtool speed settings were strictly followed. Unfortunately ethtool doesn't seem to set ADVERTISED_Autoneg in the advertising field (and maybe it shouldn't have to). I'd vote that it should be fixed there, but it should also be added here just in case someone using ethtool ioctls in their own application gets what they want.

Adding that flag in tg3_set_settings seemed like the most logical place since the driver works fine on boot. This is just an issue when re-enabling autonegotiation, so we should probably nip it there.

---

 tg3.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/tg3.c +2 -1
index d4ac6e9..0a414be 100644
@@ -8070,7 +8070,8 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 	tp->link_config.autoneg = cmd->autoneg;
 	if (cmd->autoneg == AUTONEG_ENABLE) {
-		tp->link_config.advertising = cmd->advertising;
+		tp->link_config.advertising = (cmd->advertising |
+					      ADVERTISED_Autoneg);
 		tp->link_config.speed = SPEED_INVALID;
 		tp->link_config.duplex = DUPLEX_INVALID;
 	} else {
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Andy Gospodarek

Adding that flag in tg3_set_settings seemed like the most logical place
since the driver works fine on boot. This is just an issue when re-enabling autonegotiation, so we should probably nip it there.

We also noticed this issue recently, but didn't pay too much attention to it since it was more of a "cosmetic" issue. The driver behaves the same since we rely on cmd->autoneg to decide whether to enable autoneg or not. Your fix seems reasonable to me. Thanks.

#2 lore raw
Quoted 6 lines · Michael Chan
Quoted 5 lines · Andy Gospodarek

Adding that flag in tg3_set_settings seemed like the most logical place
since the driver works fine on boot. This is just an issue when re-enabling autonegotiation, so we should probably nip it there.

Quoted 9 lines
Quoted 1 line

We also noticed this issue recently, but didn't pay too much attention to it since it was more of a "cosmetic" issue. The driver behaves the same since we rely on cmd->autoneg to decide whether to enable autoneg or not. Your fix seems reasonable to me. Thanks.

I completely agree that it's cosmetic, it just seems like something decent to toss in there since it's the kind of thing others will start complaining about.

maintainer Applied
#3 lore raw
In reply to Michael Chan

From: "Michael Chan" <[email protected]>
Date: Tue, 02 Oct 2007 15:02:56 -0700

Quoted 6 lines · Andy Gospodarek
Quoted 5 lines

Adding that flag in tg3_set_settings seemed like the most logical place
since the driver works fine on boot. This is just an issue when re-enabling autonegotiation, so we should probably nip it there.

Quoted 8 lines
Quoted 1 line

We also noticed this issue recently, but didn't pay too much attention to it since it was more of a "cosmetic" issue. The driver behaves the same since we rely on cmd->autoneg to decide whether to enable autoneg or not. Your fix seems reasonable to me. Thanks.

Applied, thanks everyone!