ehea: fix wrongly reported speed and port

PATCH Applied Kleber Sacilotto de Souza 2 participants 2 messages May 4, 2011 – May 9, 2011 1 message not in the archive

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Kleber Sacilotto de Souza

author

2011-05-04 23:05 UTC #0 lore raw

PATCH 1/1 ehea: fix wrongly reported speed and port

Currently EHEA reports to ethtool as supporting 10M, 100M, 1G and 10G and connected to FIBRE independent of the hardware configuration. However, when connected to FIBRE the only supported speed is 10G full-duplex, and the other speeds and modes are only supported when connected to twisted pair.

Signed-off-by Kleber Sacilotto de Souza <[email protected]>

---
 drivers/net/ehea/ehea_ethtool.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

drivers/net/ehea/ehea_ethtool.c +13 -8

index 3e2e734..f3bbdce 100644
@@ -55,15 +55,20 @@ static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 		cmd->duplex = -1;
 	}
 
-	cmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full
-		       | SUPPORTED_100baseT_Full |  SUPPORTED_100baseT_Half
-		       | SUPPORTED_10baseT_Full | SUPPORTED_10baseT_Half
-		       | SUPPORTED_Autoneg | SUPPORTED_FIBRE);
-
-	cmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_Autoneg
-			 | ADVERTISED_FIBRE);
+	if (cmd->speed == SPEED_10000) {
+		cmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+		cmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
+		cmd->port = PORT_FIBRE;
+	} else {
+		cmd->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full
+			       | SUPPORTED_100baseT_Half | SUPPORTED_10baseT_Full
+			       | SUPPORTED_10baseT_Half | SUPPORTED_Autoneg
+			       | SUPPORTED_TP);
+		cmd->advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg
+				 | ADVERTISED_TP);
+		cmd->port = PORT_TP;
+	}
 
-	cmd->port = PORT_FIBRE;
 	cmd->autoneg = port->autoneg == 1 ? AUTONEG_ENABLE : AUTONEG_DISABLE;
 
 	return 0;

Signature · 1 line

1.7.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

David Miller

maintainer Applied

2011-05-09 18:50 UTC #2 lore raw

From: Breno Leitao <[email protected]>
Date: Fri, 06 May 2011 15:57:11 -0300

Quoted 9 lines · Kleber Sacilotto de Souza

Quoted 7 lines
Currently EHEA reports to ethtool as supporting 10M, 100M, 1G and 10G and connected to FIBRE independent of the hardware configuration. However, when connected to FIBRE the only supported speed is 10G full-duplex, and the other speeds and modes are only supported when connected to twisted pair.
Signed-off-by Kleber Sacilotto de Souza <[email protected]>
Acked-by Breno Leitao <[email protected]>

Applied, thanks.