net: Revert devlink health changes.

This reverts the devlink health changes from 9/17/2019,
Jiri wants things to be designed differently and it was
agreed that the easiest way to do this is start from the
beginning again.

Commits reverted:

cb5ccfbe73b389470e1dc11061bb185ef4bc9aec
880ee82f0313453ec5a6cb122866ac057263066b
c7af343b4e33578b7de91786a3f639c8cfa0d97b
ff253fedab961b22117a73ab808fcfa9e6852b50
6f9d56132eb6d2603d4273cfc65bed914ec47acb
fcd852c69d776c0f46c8f79e8e431e5cc6ddc7b7
8a66704a13d9713593342e29b4f0c19762f5746b
12bd0dcefe88782ac1c9fff632958dd1b71d27e5
aba25279c10094c5c97d09c3491ca86d00b4ad5e
ce019faa70f81555fa17ebc1d5a03651f2e7e15a
b8c45a033acc607201588f7665ba84207e5149e0

And the follow-on build fix:

o33a0efa4baecd689da9474ce0e8b673eb6931c60

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 25 deletions

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 6b26bb2ce4dc..6e52d3660654 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -89,13 +89,6 @@ enum devlink_command {
         DEVLINK_CMD_REGION_DEL,
         DEVLINK_CMD_REGION_READ,
 
-        DEVLINK_CMD_HEALTH_REPORTER_GET,
-        DEVLINK_CMD_HEALTH_REPORTER_SET,
-        DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
-        DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
-        DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
-        DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
-
         /* add new commands above here */
         __DEVLINK_CMD_MAX,
         DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -292,24 +285,6 @@ enum devlink_attr {
         DEVLINK_ATTR_REGION_CHUNK_ADDR,         /* u64 */
         DEVLINK_ATTR_REGION_CHUNK_LEN,          /* u64 */
 
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT,              /* nested */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_PAIR,         /* nested */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_NAME,         /* string */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE,        /* nested */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_ARRAY,  /* nested */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_TYPE,   /* u8 */
-        DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_DATA,   /* dynamic */
-
-        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_DUMP_AVAIL,        /* u8 */
-        DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,           /* u64 */
-        DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,   /* u64 */
-        DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,      /* u8 */
-
         /* add new attributes above here, update the policy in devlink.c */
 
         __DEVLINK_ATTR_MAX,