Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eddd2cf1 authored by Eli Cohen's avatar Eli Cohen Committed by David S. Miller
Browse files

net: Change TCA_ACT_* to TCA_ID_* to match that of TCA_ID_POLICE 



Modify the kernel users of the TCA_ACT_* macros to use TCA_ID_*. For
example, use TCA_ID_GACT instead of TCA_ACT_GACT. This will align with
TCA_ID_POLICE and also differentiates these identifier, used in struct
tc_action_ops type field, from other macros starting with TCA_ACT_.

To make things clearer, we name the enum defining the TCA_ID_*
identifiers and also change the "type" field of struct tc_action to
id.

Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 257eeded

include/net/act_api.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline void tcf_tm_dump(struct tcf_t *dtm, const struct tcf_t *stm) 
struct tc_action_ops {

	struct list_head head;

	char    kind[IFNAMSIZ];

	__u32   type; /* TBD to match kind */

	enum tca_id  id; /* identifier should match kind */

	size_t	size;

	struct module		*owner;

	int     (*act)(struct sk_buff *, const struct tc_action *,

include/net/tc_act/tc_csum.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct tcf_csum { 
static inline bool is_tcf_csum(const struct tc_action *a)

{

#ifdef CONFIG_NET_CLS_ACT

	if (a->ops && a->ops->type == TCA_ACT_CSUM)

	if (a->ops && a->ops->id == TCA_ID_CSUM)

		return true;

#endif

	return false;

include/net/tc_act/tc_gact.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static inline bool __is_tcf_gact_act(const struct tc_action *a, int act, 
#ifdef CONFIG_NET_CLS_ACT

	struct tcf_gact *gact;



	if (a->ops && a->ops->type != TCA_ACT_GACT)

	if (a->ops && a->ops->id != TCA_ID_GACT)

		return false;



	gact = to_gact(a);

include/net/tc_act/tc_mirred.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct tcf_mirred { 
static inline bool is_tcf_mirred_egress_redirect(const struct tc_action *a)

{

#ifdef CONFIG_NET_CLS_ACT

	if (a->ops && a->ops->type == TCA_ACT_MIRRED)

	if (a->ops && a->ops->id == TCA_ID_MIRRED)

		return to_mirred(a)->tcfm_eaction == TCA_EGRESS_REDIR;

#endif

	return false;
@@ -26,7 +26,7 @@ static inline bool is_tcf_mirred_egress_redirect(const struct tc_action *a) 
static inline bool is_tcf_mirred_egress_mirror(const struct tc_action *a)

{

#ifdef CONFIG_NET_CLS_ACT

	if (a->ops && a->ops->type == TCA_ACT_MIRRED)

	if (a->ops && a->ops->id == TCA_ID_MIRRED)

		return to_mirred(a)->tcfm_eaction == TCA_EGRESS_MIRROR;

#endif

	return false;

include/net/tc_act/tc_pedit.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct tcf_pedit { 
static inline bool is_tcf_pedit(const struct tc_action *a)

{

#ifdef CONFIG_NET_CLS_ACT

	if (a->ops && a->ops->type == TCA_ACT_PEDIT)

	if (a->ops && a->ops->id == TCA_ID_PEDIT)

		return true;

#endif

	return false;