Update kernel headers

Update kernel headers to commit:
    bc081a693a56 ("Merge branch 'Offload-tc-vlan-mangle-to-mscc_ocelot-switch'")

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 39265000d818f95bb445e54d39d0a0afc96d44e3..e639a4e5c78575c0f5a5845da44632c06295807b 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -301,6 +301,29 @@ enum {
        DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
 };
 
+enum devlink_reload_action {
+       DEVLINK_RELOAD_ACTION_UNSPEC,
+       DEVLINK_RELOAD_ACTION_DRIVER_REINIT,    /* Driver entities re-instantiation */
+       DEVLINK_RELOAD_ACTION_FW_ACTIVATE,      /* FW activate */
+
+       /* Add new reload actions above */
+       __DEVLINK_RELOAD_ACTION_MAX,
+       DEVLINK_RELOAD_ACTION_MAX = __DEVLINK_RELOAD_ACTION_MAX - 1
+};
+
+enum devlink_reload_limit {
+       DEVLINK_RELOAD_LIMIT_UNSPEC,    /* unspecified, no constraints */
+       DEVLINK_RELOAD_LIMIT_NO_RESET,  /* No reset allowed, no down time allowed,
+                                        * no link flap and no configuration is lost.
+                                        */
+
+       /* Add new reload limit above */
+       __DEVLINK_RELOAD_LIMIT_MAX,
+       DEVLINK_RELOAD_LIMIT_MAX = __DEVLINK_RELOAD_LIMIT_MAX - 1
+};
+
+#define DEVLINK_RELOAD_LIMITS_VALID_MASK (BIT(__DEVLINK_RELOAD_LIMIT_MAX) - 1)
+
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,
@@ -493,6 +516,17 @@ enum devlink_attr {
        DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,       /* u64 */
        DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK,       /* bitfield32 */
 
+       DEVLINK_ATTR_RELOAD_ACTION,             /* u8 */
+       DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED,  /* bitfield32 */
+       DEVLINK_ATTR_RELOAD_LIMITS,             /* bitfield32 */
+
+       DEVLINK_ATTR_DEV_STATS,                 /* nested */
+       DEVLINK_ATTR_RELOAD_STATS,              /* nested */
+       DEVLINK_ATTR_RELOAD_STATS_ENTRY,        /* nested */
+       DEVLINK_ATTR_RELOAD_STATS_LIMIT,        /* u8 */
+       DEVLINK_ATTR_RELOAD_STATS_VALUE,        /* u32 */
+       DEVLINK_ATTR_REMOTE_RELOAD_STATS,       /* nested */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index f774920506b3206d8cd3532451ed306242bd0bc9..dfef006be9f91f397e7ab25a6fc7b4de94f39530 100644 (file)
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -129,6 +129,7 @@ struct nlmsgerr {
  * @NLMSGERR_ATTR_COOKIE: arbitrary subsystem specific cookie to
  *     be used - in the success case - to identify a created
  *     object or operation or similar (binary)
+ * @NLMSGERR_ATTR_POLICY: policy for a rejected attribute
  * @__NLMSGERR_ATTR_MAX: number of attributes
  * @NLMSGERR_ATTR_MAX: highest attribute number
  */
@@ -137,6 +138,7 @@ enum nlmsgerr_attrs {
        NLMSGERR_ATTR_MSG,
        NLMSGERR_ATTR_OFFS,
        NLMSGERR_ATTR_COOKIE,
+       NLMSGERR_ATTR_POLICY,
 
        __NLMSGERR_ATTR_MAX,
        NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1