OSDN Git Service

net/mlx5e: Revert parameters on errors when changing PTP state without reset
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Fri, 29 Jan 2021 12:04:34 +0000 (14:04 +0200)
committerSaeed Mahameed <saeedm@nvidia.com>
Wed, 10 Mar 2021 19:01:53 +0000 (11:01 -0800)
commit74640f09735f935437bd8df9fe61a66f03eabb34
tree458426acda2e277d8e79e2e2fe6072dbe1403dae
parente5eb01344e9b09bb9d255b9727449186f7168df8
net/mlx5e: Revert parameters on errors when changing PTP state without reset

Port timestamping for PTP can be enabled/disabled while the channels are
closed. In that case mlx5e_safe_switch_channels is skipped, and the
preactivate hook is called directly. However, if that hook returns an
error, the channel parameters must be reverted back to their old values.
This commit adds missing handling on this case.

Fixes: 145e5637d941 ("net/mlx5e: Add TX PTP port object support")
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c