summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-02-21 21:38:52 +0300
committerDavid S. Miller <davem@davemloft.net>2019-02-21 21:38:52 +0300
commitcceb58b113e1e09818134dfd588627888a91970f (patch)
tree4b256bff1f8a52ddfbec374bb5321d3d883643a1 /include/uapi/linux
parent9311defc1991eea31bc38899242603634092cdbd (diff)
parent574b1e1f457c631d356e55aaef26ee638a96d548 (diff)
downloadlinux-cceb58b113e1e09818134dfd588627888a91970f.tar.xz
Merge branch 'devlink-next'
Eran Ben Elisha says: ==================== Devlink health fixes series This series includes two small fixes from Aya for the devlink health infrastructure introduced earlier in this window. First patch rename some UAPI attributes to better reflect their use. Second patch reduces the amount of data passed from the devlink to the netlink layer upon get reporter command, in case of no-recovery reporter. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/devlink.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 53de8802a000..5bb4ea67d84f 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -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 */