It would be good to be able to harminize the use of "xlate", "execute",
"compose", etc. "xlate" clearly relates to the use of the various
translation context structures, but the distinction between "execute" and
"compose" is not that clear, so these names could be going either way.
Choose to go with "compose", keeping with the older tradition.
Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
-execute_mpls_push_action(struct xlate_ctx *ctx, ovs_be16 eth_type)
+compose_mpls_push_action(struct xlate_ctx *ctx, ovs_be16 eth_type)
{
ovs_assert(eth_type_mpls(eth_type));
{
ovs_assert(eth_type_mpls(eth_type));
-execute_mpls_pop_action(struct xlate_ctx *ctx, ovs_be16 eth_type)
+compose_mpls_pop_action(struct xlate_ctx *ctx, ovs_be16 eth_type)
{
ovs_assert(eth_type_mpls(ctx->xin->flow.dl_type));
ovs_assert(!eth_type_mpls(eth_type));
{
ovs_assert(eth_type_mpls(ctx->xin->flow.dl_type));
ovs_assert(!eth_type_mpls(eth_type));
-execute_set_mpls_ttl_action(struct xlate_ctx *ctx, uint8_t ttl)
+compose_set_mpls_ttl_action(struct xlate_ctx *ctx, uint8_t ttl)
{
if (!eth_type_mpls(ctx->xin->flow.dl_type)) {
return true;
{
if (!eth_type_mpls(ctx->xin->flow.dl_type)) {
return true;
-execute_dec_mpls_ttl_action(struct xlate_ctx *ctx)
+compose_dec_mpls_ttl_action(struct xlate_ctx *ctx)
{
uint8_t ttl = mpls_lse_to_ttl(ctx->xin->flow.mpls_lse);
{
uint8_t ttl = mpls_lse_to_ttl(ctx->xin->flow.mpls_lse);
break;
case OFPACT_PUSH_MPLS:
break;
case OFPACT_PUSH_MPLS:
- execute_mpls_push_action(ctx, ofpact_get_PUSH_MPLS(a)->ethertype);
+ compose_mpls_push_action(ctx, ofpact_get_PUSH_MPLS(a)->ethertype);
break;
case OFPACT_POP_MPLS:
break;
case OFPACT_POP_MPLS:
- execute_mpls_pop_action(ctx, ofpact_get_POP_MPLS(a)->ethertype);
+ compose_mpls_pop_action(ctx, ofpact_get_POP_MPLS(a)->ethertype);
break;
case OFPACT_SET_MPLS_TTL:
break;
case OFPACT_SET_MPLS_TTL:
- if (execute_set_mpls_ttl_action(ctx,
+ if (compose_set_mpls_ttl_action(ctx,
ofpact_get_SET_MPLS_TTL(a)->ttl)) {
goto out;
}
break;
case OFPACT_DEC_MPLS_TTL:
ofpact_get_SET_MPLS_TTL(a)->ttl)) {
goto out;
}
break;
case OFPACT_DEC_MPLS_TTL:
- if (execute_dec_mpls_ttl_action(ctx)) {
+ if (compose_dec_mpls_ttl_action(ctx)) {