diff options
| author | Amir Vadai <amirv@mellanox.com> | 2014-03-02 10:25:02 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-24 13:39:19 +1000 |
| commit | 87fc43711531baaefcfdc36151dbbbed08e07e53 (patch) | |
| tree | 894751858c0c11dc18378c7db95e91f4fa5b6a29 | |
| parent | 9fa767348ab58bd0ba9abed3672569839fd14975 (diff) | |
| download | powerpc-87fc43711531baaefcfdc36151dbbbed08e07e53.tar.gz | |
net/mlx4_en: Fix selftest failing on non 10G link speed
Connect-X devices selftest speed test shouldn't fail on 1G and 40G link
speeds.
BZ: 113608
Cherry-pick of 313c2d375b1c9b648d9d4b96ec1b8185ac6a78c5
Signed-off-by: Carol Soto <clsoto@linux.vnet.ibm.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c index 2448f0d669e6ca..80d28aa24188d2 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c @@ -129,8 +129,10 @@ static int mlx4_en_test_speed(struct mlx4_en_priv *priv) if (mlx4_en_QUERY_PORT(priv->mdev, priv->port)) return -ENOMEM; - /* The device currently only supports 10G speed */ - if (priv->port_state.link_speed != SPEED_10000) + /* The device supports 1G, 10G and 40G speeds */ + if (priv->port_state.link_speed != 1000 && + priv->port_state.link_speed != 10000 && + priv->port_state.link_speed != 40000) return priv->port_state.link_speed; return 0; } |