@@ -766,16 +766,18 @@ enum {
#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
/* tcamsg flags stored in attribute TCA_ROOT_FLAGS
*
- * TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than TCA_ACT_MAX_PRIO
- * actions in a dump. All dump responses will contain the number of actions
- * being dumped stored in for user app's consumption in TCA_ROOT_COUNT
+ * TCA_ACT_FLAG_LARGE_DUMP_ON user->kernel to request for larger than
+ * TCA_ACT_MAX_PRIO actions in a dump. All dump responses will contain the
+ * number of actions being dumped stored in for user app's consumption in
+ * TCA_ROOT_COUNT
*
- * TCA_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only
+ * TCA_ACT_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only
* includes essential action info (kind, index, etc.)
*
*/
#define TCA_FLAG_LARGE_DUMP_ON (1 << 0)
-#define TCA_FLAG_TERSE_DUMP (1 << 1)
+#define TCA_ACT_FLAG_LARGE_DUMP_ON TCA_FLAG_LARGE_DUMP_ON
+#define TCA_ACT_FLAG_TERSE_DUMP (1 << 1)
/* New extended info filters for IFLA_EXT_MASK */
#define RTEXT_FILTER_VF (1 << 0)
@@ -735,8 +735,8 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event)
addattr_nest_end(&req.n, tail);
tail3 = NLMSG_TAIL(&req.n);
- flag_select.value |= TCA_FLAG_LARGE_DUMP_ON;
- flag_select.selector |= TCA_FLAG_LARGE_DUMP_ON;
+ flag_select.value |= TCA_ACT_FLAG_LARGE_DUMP_ON;
+ flag_select.selector |= TCA_ACT_FLAG_LARGE_DUMP_ON;
addattr_l(&req.n, MAX_MSG, TCA_ROOT_FLAGS, &flag_select,
sizeof(struct nla_bitfield32));
tail3->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail3;
Use TCA_ACT_FLAG_LARGE_DUMP_ON alias according to new preferred naming for action flags. Signed-off-by: Vlad Buslov <vlad@buslov.dev> --- include/uapi/linux/rtnetlink.h | 12 +++++++----- tc/m_action.c | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-)