Commit 54719527 authored by Aya Levin's avatar Aya Levin Committed by David S. Miller
Browse files

devlink: Rename devlink health attributes 



Rename devlink health attributes for better reflect the attributes use.
Add COUNT prefix on error counter attribute and recovery counter
attribute.

Fixes: 7afe335a ("devlink: Add health get command")
Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9311defc

include/uapi/linux/devlink.h

+2 −2
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ enum devlink_attr { 
	DEVLINK_ATTR_HEALTH_REPORTER,			/* nested */

	DEVLINK_ATTR_HEALTH_REPORTER_NAME,		/* string */

	DEVLINK_ATTR_HEALTH_REPORTER_STATE,		/* u8 */

	DEVLINK_ATTR_HEALTH_REPORTER_ERR,		/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_RECOVER,		/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,		/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,	/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,		/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,	/* u64 */

	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,	/* u8 */

net/core/devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -4650,10 +4650,10 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg, 
	if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,

		       reporter->health_state))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR,

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,

			      reporter->error_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER,

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,

			      reporter->recovery_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,

CRA Git | Maintained and supported by SUSTech CRA and CCSE