mdio: Advertise pause (flow control) settings even if autoneg is off
Subsystems (2)
PATCH 1/3 mdio: Advertise pause (flow control) settings even if autoneg is off
Currently, if pause autoneg is off we do not set either pause advertising flag. If autonegotiation of speed and duplex settings is enabled, there is no way for the link partner to distinguish this from our refusing to use pause frames.
We should instead set the advertising flags according to the forced mode so that the link partner can follow our lead. This is consistent with the behaviour of other drivers.
--- drivers/net/mdio.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/net/mdio.c +3 -5
@@ -344,11 +344,9 @@ void mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio, old_adv = mdio->mdio_read (mdio->dev, mdio->prtad,MDIO_MMD_AN ,MDIO_AN_ADVERTISE ); - adv = old_adv & ~(ADVERTISE_PAUSE_CAP |ADVERTISE_PAUSE_ASYM ); -if (ecmd->autoneg) - adv |=mii_advertise_flowctrl ( - (ecmd->rx_pause ?FLOW_CTRL_RX :0 ) | - (ecmd->tx_pause ?FLOW_CTRL_TX :0 )); + adv = ((old_adv & ~(ADVERTISE_PAUSE_CAP |ADVERTISE_PAUSE_ASYM )) | +mii_advertise_flowctrl ((ecmd->rx_pause ?FLOW_CTRL_RX :0 ) | + (ecmd->tx_pause ?FLOW_CTRL_TX :0 )));if (adv != old_adv) { mdio->mdio_write (mdio->dev, mdio->prtad,MDIO_MMD_AN ,MDIO_AN_ADVERTISE , adv);
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
From: Ben Hutchings <[email protected]>
Date: Mon, 12 Oct 2009 20:26:17 +0100
Quoted 10 lines
Currently, if pause autoneg is off we do not set either pause advertising flag. If autonegotiation of speed and duplex settings is enabled, there is no way for the link partner to distinguish this from our refusing to use pause frames.
We should instead set the advertising flags according to the forced mode so that the link partner can follow our lead. This is consistent with the behaviour of other drivers.
Signed-off-by Ben Hutchings <[email protected]>
Applied to net-next-2.6