Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 642e1d8a authored by Shay Agroskin's avatar Shay Agroskin Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: Removed unnecessary warnings in FEC caps query 



[ Upstream commit 64e283348458e2fd2fe41b60dfb6c30e88ee695f ]

Querying interface FEC caps with 'ethtool [int]' after link reset
throws warning regading link speed.
This warning is not needed as there is already an indication in
user space that the link is not up.

Fixes: 0696d608 ("net/mlx5e: Receive buffer configuration")
Signed-off-by: default avatarShay Agroskin <shayag@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb3255de

drivers/net/ethernet/mellanox/mlx5/core/en/port.c

+1 −3
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ int mlx5e_port_linkspeed(struct mlx5_core_dev *mdev, u32 *speed) 


	eth_proto_oper = MLX5_GET(ptys_reg, out, eth_proto_oper);

	*speed = mlx5e_port_ptys2speed(eth_proto_oper);

	if (!(*speed)) {

		mlx5_core_warn(mdev, "cannot get port speed\n");

	if (!(*speed))

		err = -EINVAL;

	}



	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c

+3 −1
Original line number Diff line number Diff line
@@ -130,8 +130,10 @@ static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu) 
	int err;



	err = mlx5e_port_linkspeed(priv->mdev, &speed);

	if (err)

	if (err) {

		mlx5_core_warn(priv->mdev, "cannot get port speed\n");

		return 0;

	}



	xoff = (301 + 216 * priv->dcbx.cable_len / 100) * speed / 1000 + 272 * mtu / 100;