Update to kernel headers v4.10.
Test: Built angler, booted on angler, ran bionic unit tests.
Change-Id: Ia24511e74106116ea84b44ab724865ec492de8f9
diff --git a/libc/kernel/uapi/linux/devlink.h b/libc/kernel/uapi/linux/devlink.h
index 1188604..5de703c 100644
--- a/libc/kernel/uapi/linux/devlink.h
+++ b/libc/kernel/uapi/linux/devlink.h
@@ -89,42 +89,51 @@
DEVLINK_ESWITCH_MODE_LEGACY,
DEVLINK_ESWITCH_MODE_SWITCHDEV,
};
-enum devlink_attr {
+enum devlink_eswitch_inline_mode {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_UNSPEC,
- DEVLINK_ATTR_BUS_NAME,
- DEVLINK_ATTR_DEV_NAME,
- DEVLINK_ATTR_PORT_INDEX,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_PORT_TYPE,
- DEVLINK_ATTR_PORT_DESIRED_TYPE,
- DEVLINK_ATTR_PORT_NETDEV_IFINDEX,
- DEVLINK_ATTR_PORT_NETDEV_NAME,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_PORT_IBDEV_NAME,
- DEVLINK_ATTR_PORT_SPLIT_COUNT,
- DEVLINK_ATTR_PORT_SPLIT_GROUP,
- DEVLINK_ATTR_SB_INDEX,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_SB_SIZE,
- DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,
- DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,
- DEVLINK_ATTR_SB_INGRESS_TC_COUNT,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_SB_EGRESS_TC_COUNT,
- DEVLINK_ATTR_SB_POOL_INDEX,
- DEVLINK_ATTR_SB_POOL_TYPE,
- DEVLINK_ATTR_SB_POOL_SIZE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,
- DEVLINK_ATTR_SB_THRESHOLD,
- DEVLINK_ATTR_SB_TC_INDEX,
- DEVLINK_ATTR_SB_OCC_CUR,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- DEVLINK_ATTR_SB_OCC_MAX,
- DEVLINK_ATTR_ESWITCH_MODE,
- __DEVLINK_ATTR_MAX,
- DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
+ DEVLINK_ESWITCH_INLINE_MODE_NONE,
+ DEVLINK_ESWITCH_INLINE_MODE_LINK,
+ DEVLINK_ESWITCH_INLINE_MODE_NETWORK,
+ DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
+enum devlink_attr {
+ DEVLINK_ATTR_UNSPEC,
+ DEVLINK_ATTR_BUS_NAME,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_DEV_NAME,
+ DEVLINK_ATTR_PORT_INDEX,
+ DEVLINK_ATTR_PORT_TYPE,
+ DEVLINK_ATTR_PORT_DESIRED_TYPE,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_PORT_NETDEV_IFINDEX,
+ DEVLINK_ATTR_PORT_NETDEV_NAME,
+ DEVLINK_ATTR_PORT_IBDEV_NAME,
+ DEVLINK_ATTR_PORT_SPLIT_COUNT,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_PORT_SPLIT_GROUP,
+ DEVLINK_ATTR_SB_INDEX,
+ DEVLINK_ATTR_SB_SIZE,
+ DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,
+ DEVLINK_ATTR_SB_INGRESS_TC_COUNT,
+ DEVLINK_ATTR_SB_EGRESS_TC_COUNT,
+ DEVLINK_ATTR_SB_POOL_INDEX,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_SB_POOL_TYPE,
+ DEVLINK_ATTR_SB_POOL_SIZE,
+ DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,
+ DEVLINK_ATTR_SB_THRESHOLD,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_SB_TC_INDEX,
+ DEVLINK_ATTR_SB_OCC_CUR,
+ DEVLINK_ATTR_SB_OCC_MAX,
+ DEVLINK_ATTR_ESWITCH_MODE,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ DEVLINK_ATTR_ESWITCH_INLINE_MODE,
+ __DEVLINK_ATTR_MAX,
+ DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif