History

net: sched: uapi: add more sanely named duplicate defines

The TCA_FLOWER_KEY_CFM enum has a UNSPEC and MAX with _OPT in the name, but the real attributes don't. Add a MAX that more reasonably matches the attrs. The PAD in TCA_TAPRIO is the only attr which doesn't have _ATTR in it, perhaps signifying that it's not a real attr? If so interesting idea in abstract but it makes codegen painful.

Jakub Kicinski committed 1 year ago

Commit 1119e551 parent 2da35e42 files · +2 −0Browse files

Showing the changes to include/uapi/linux (2 of 2 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/pkt_cls.h +1 −0
  2. include/uapi/linux/pkt_sched.h +1 −0
include/uapi/linux/pkt_cls.h+1−0
@@ -697,6 +697,7 @@ enum { · 696 unmodified lines
697};697};
698 698
699#define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)699#define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)
700#define TCA_FLOWER_KEY_CFM_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)
700 701
701#define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */702#define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */
702 703
include/uapi/linux/pkt_sched.h+1−0
@@ -1182,6 +1182,7 @@ enum { · 1181 unmodified lines
1182 TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */1182 TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */
1183 TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */1183 TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */
1184 TCA_TAPRIO_PAD,1184 TCA_TAPRIO_PAD,
1185 TCA_TAPRIO_ATTR_PAD = TCA_TAPRIO_PAD,
1185 TCA_TAPRIO_ATTR_ADMIN_SCHED, /* The admin sched, only used in dump */1186 TCA_TAPRIO_ATTR_ADMIN_SCHED, /* The admin sched, only used in dump */
1186 TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */1187 TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */
1187 TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */1188 TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */