lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 7 Dec 2014 18:27:35 +0200 From: Amir Vadai <amirv@...lanox.com> To: "David S. Miller" <davem@...emloft.net> Cc: netdev@...r.kernel.org, Or Gerlitz <ogerlitz@...lanox.com>, Amir Vadai <amirv@...lanox.com>, Yevgeny Petrilin <yevgenyp@...lanox.com>, Saeed Mahameed <saeedm@...lanox.com> Subject: [PATCH net-next V1] net/mlx4_en: ethtool force speed when asking for autoneg=off From: Saeed Mahameed <saeedm@...lanox.com> Use cmd->autoneg == AUTONEG_DISABLE as a user hint to force specific speed. We don't want to rely on ethtool to calculate advertised link modes when forcing specific speed, a user can request a specific speed and specify "autoneg off" in ethtool command to give a hint for forcing this speed. Move en_warn("port reset..") inside the "port reset" block. Fixes: d48b3ab ("net/mlx4_en: Use PTYS register to set ethtool settings (Speed)") Signed-off-by: Saeed Mahameed <saeedm@...lanox.com> Signed-off-by: Amir Vadai <amirv@...lanox.com> --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index c45e06a..06752e4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -771,13 +771,13 @@ static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) } proto_admin = cpu_to_be32(ptys_adv); - if (speed >= 0 && speed != priv->port_state.link_speed) + if (speed >= 0 && (speed != priv->port_state.link_speed || + cmd->autoneg == AUTONEG_DISABLE)) /* If speed was set then speed decides :-) */ proto_admin = speed_set_ptys_admin(priv, speed, ptys_reg.eth_proto_cap); proto_admin &= ptys_reg.eth_proto_cap; - if (proto_admin == ptys_reg.eth_proto_admin) return 0; /* Nothing to change */ @@ -798,9 +798,9 @@ static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) return ret; } - en_warn(priv, "Port link mode changed, restarting port...\n"); mutex_lock(&priv->mdev->state_lock); if (priv->port_up) { + en_warn(priv, "Port link mode changed, restarting port...\n"); mlx4_en_stop_port(dev, 1); if (mlx4_en_start_port(dev)) en_err(priv, "Failed restarting port %d\n", priv->port); -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists