diff options
| author | Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2010-08-24 03:46:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-24 14:54:51 -0700 |
| commit | 7699517db435fd24143bd32dd644275e3eeb4c86 (patch) | |
| tree | e39bad6758eb4172cd4bafe481803c8f752a2630 /drivers/net/mlx4/en_ethtool.c | |
| parent | e7c1c2c46201e46f8ce817196507d2ffd3dafd8e (diff) | |
| download | kernel_samsung_smdk4412-7699517db435fd24143bd32dd644275e3eeb4c86.zip kernel_samsung_smdk4412-7699517db435fd24143bd32dd644275e3eeb4c86.tar.gz kernel_samsung_smdk4412-7699517db435fd24143bd32dd644275e3eeb4c86.tar.bz2 | |
mlx4_en: Fixing report in Ethtool get_settings
The report now based on query from FW, giving the correct tranciever type
and link speed.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4/en_ethtool.c')
| -rw-r--r-- | drivers/net/mlx4/en_ethtool.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c index f7d72d7..fa2f2f4 100644 --- a/drivers/net/mlx4/en_ethtool.c +++ b/drivers/net/mlx4/en_ethtool.c @@ -244,16 +244,39 @@ static void mlx4_en_get_strings(struct net_device *dev, static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { + struct mlx4_en_priv *priv = netdev_priv(dev); + int trans_type; + cmd->autoneg = AUTONEG_DISABLE; cmd->supported = SUPPORTED_10000baseT_Full; - cmd->advertising = ADVERTISED_1000baseT_Full; + cmd->advertising = ADVERTISED_10000baseT_Full; + + if (mlx4_en_QUERY_PORT(priv->mdev, priv->port)) + return -ENOMEM; + + trans_type = priv->port_state.transciver; if (netif_carrier_ok(dev)) { - cmd->speed = SPEED_10000; + cmd->speed = priv->port_state.link_speed; cmd->duplex = DUPLEX_FULL; } else { cmd->speed = -1; cmd->duplex = -1; } + + if (trans_type > 0 && trans_type <= 0xC) { + cmd->port = PORT_FIBRE; + cmd->transceiver = XCVR_EXTERNAL; + cmd->supported |= SUPPORTED_FIBRE; + cmd->advertising |= ADVERTISED_FIBRE; + } else if (trans_type == 0x80 || trans_type == 0) { + cmd->port = PORT_TP; + cmd->transceiver = XCVR_INTERNAL; + cmd->supported |= SUPPORTED_TP; + cmd->advertising |= ADVERTISED_TP; + } else { + cmd->port = -1; + cmd->transceiver = -1; + } return 0; } |