[PATCH net-next 6/6] be2net: fix to set ecmd->autoneg correctly
flat view
STALE5555d
From: Ajit Khaparde <hidden>
Date: 2011-08-05 20:01:39
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Set the autonegotation settings correctly based on the port speed. Signed-off-by: Suresh Reddy <redacted> Signed-off-by: Ajit Khaparde <redacted> --- drivers/net/benet/be_ethtool.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 5dd3ed6..2177c8c 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c@@ -353,6 +353,8 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) u8 mac_speed = 0; u16 link_speed = 0; int status; + u16 port_speed = 0; + u16 dac_cable_len = 0; if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) { status = be_cmd_link_status_query(adapter, &mac_speed,
@@ -397,11 +399,9 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) switch (phy_info.interface_type) { case PHY_TYPE_KR_10GB: case PHY_TYPE_KX4_10GB: - ecmd->autoneg = AUTONEG_ENABLE; ecmd->transceiver = XCVR_INTERNAL; break; default: - ecmd->autoneg = AUTONEG_DISABLE; ecmd->transceiver = XCVR_EXTERNAL; break; }
@@ -411,12 +411,25 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) adapter->link_speed = ethtool_cmd_speed(ecmd); adapter->port_type = ecmd->port; adapter->transceiver = ecmd->transceiver; - adapter->autoneg = ecmd->autoneg; } else { ethtool_cmd_speed_set(ecmd, adapter->link_speed); ecmd->port = adapter->port_type; ecmd->transceiver = adapter->transceiver; - ecmd->autoneg = adapter->autoneg; + } + + be_cmd_get_port_speed(adapter, adapter->port_num, + &dac_cable_len, &port_speed); + switch (port_speed) { + case SPEED_FORCED_10GB: + case SPEED_FORCED_1GB: + case SPEED_FORCED_100MB: + case SPEED_FORCED_10MB: + case SPEED_DEFAULT: + ecmd->autoneg = AUTONEG_DISABLE; + break; + default: + ecmd->autoneg = AUTONEG_ENABLE; + break; } ecmd->duplex = DUPLEX_FULL;
--
1.7.4.1