diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
| commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
| tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | |
| parent | perf/core: Optimize perf_init_event() for TYPE_SOFTWARE (diff) | |
| parent | Linux 5.4-rc7 (diff) | |
| download | linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.xz linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.zip | |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c index 840ec945ccba..bbff8d8ded76 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c @@ -35,6 +35,7 @@ #include <linux/udp.h> #include <net/udp.h> #include "en.h" +#include "en/port.h" enum { MLX5E_ST_LINK_STATE, @@ -80,22 +81,12 @@ static int mlx5e_test_link_state(struct mlx5e_priv *priv) static int mlx5e_test_link_speed(struct mlx5e_priv *priv) { - u32 out[MLX5_ST_SZ_DW(ptys_reg)]; - u32 eth_proto_oper; - int i; + u32 speed; if (!netif_carrier_ok(priv->netdev)) return 1; - if (mlx5_query_port_ptys(priv->mdev, out, sizeof(out), MLX5_PTYS_EN, 1)) - return 1; - - eth_proto_oper = MLX5_GET(ptys_reg, out, eth_proto_oper); - for (i = 0; i < MLX5E_LINK_MODES_NUMBER; i++) { - if (eth_proto_oper & MLX5E_PROT_MASK(i)) - return 0; - } - return 1; + return mlx5e_port_linkspeed(priv->mdev, &speed); } struct mlx5ehdr { |