Commit 2754125e authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

net/mlx5: Expose FW version over defined keyword 



To be aligned with the rest of the drivers, expose FW version under "fw"
keyword in devlink dev info, in addition to the existing "fw.version",
which is currently Mellanox-specific.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 557c4d2f

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+8 −2
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 
	err = devlink_info_version_running_put(req, "fw.version", version_str);

	if (err)

		return err;

	err = devlink_info_version_running_put(req,

					       DEVLINK_INFO_VERSION_GENERIC_FW,

					       version_str);

	if (err)

		return err;



	/* no pending version, return running (stored) version */

	if (stored_fw == 0)
@@ -74,8 +79,9 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 
	err = devlink_info_version_stored_put(req, "fw.version", version_str);

	if (err)

		return err;



	return 0;

	return devlink_info_version_stored_put(req,

					       DEVLINK_INFO_VERSION_GENERIC_FW,

					       version_str);

}



static int mlx5_devlink_reload_fw_activate(struct devlink *devlink, struct netlink_ext_ack *extack)