aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tc_act/tc_tunnel_key.h
diff options
context:
space:
mode:
authorEli Cohen <eli@mellanox.com>2019-02-10 14:25:00 +0200
committerDavid S. Miller <davem@davemloft.net>2019-02-10 09:28:43 -0800
commiteddd2cf195d6fb5e4bbc91a0fe4be55110f559ab (patch)
tree07f8389f0654b58d8f09315fef2000ca61081ca8 /include/net/tc_act/tc_tunnel_key.h
parentnet: Move all TC actions identifiers to one place (diff)
downloadlinux-dev-eddd2cf195d6fb5e4bbc91a0fe4be55110f559ab.tar.xz
linux-dev-eddd2cf195d6fb5e4bbc91a0fe4be55110f559ab.zip
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: Eli Cohen <eli@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tc_act/tc_tunnel_key.h')
-rw-r--r--include/net/tc_act/tc_tunnel_key.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tc_act/tc_tunnel_key.h b/include/net/tc_act/tc_tunnel_key.h
index 46b8c7f1c8d5..23d5b8b19f3e 100644
--- a/include/net/tc_act/tc_tunnel_key.h
+++ b/include/net/tc_act/tc_tunnel_key.h
@@ -34,7 +34,7 @@ static inline bool is_tcf_tunnel_set(const struct tc_action *a)
struct tcf_tunnel_key *t = to_tunnel_key(a);
struct tcf_tunnel_key_params *params = rtnl_dereference(t->params);
- if (a->ops && a->ops->type == TCA_ACT_TUNNEL_KEY)
+ if (a->ops && a->ops->id == TCA_ID_TUNNEL_KEY)
return params->tcft_action == TCA_TUNNEL_KEY_ACT_SET;
#endif
return false;
@@ -46,7 +46,7 @@ static inline bool is_tcf_tunnel_release(const struct tc_action *a)
struct tcf_tunnel_key *t = to_tunnel_key(a);
struct tcf_tunnel_key_params *params = rtnl_dereference(t->params);
- if (a->ops && a->ops->type == TCA_ACT_TUNNEL_KEY)
+ if (a->ops && a->ops->id == TCA_ID_TUNNEL_KEY)
return params->tcft_action == TCA_TUNNEL_KEY_ACT_RELEASE;
#endif
return false;