diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2017-03-08 17:18:23 -0800 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2017-03-08 17:23:57 -0800 |
| commit | a76a37efec27ac203de8424cbb2c5a81679f3b6c (patch) | |
| tree | 8520de52e1674ea73fb2fb8b742b0828450c781d /ofproto | |
| parent | b80e259f8ee41deebb3708845c4d11fcb8a120b2 (diff) | |
| download | openvswitch-a76a37efec27ac203de8424cbb2c5a81679f3b6c.tar.gz | |
conntrack: Force commit.
Userspace support for force commit.
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/ofproto-dpif-xlate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 5bbcc0dee..199852132 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -5148,7 +5148,8 @@ compose_conntrack_action(struct xlate_ctx *ctx, struct ofpact_conntrack *ofc) ct_offset = nl_msg_start_nested(ctx->odp_actions, OVS_ACTION_ATTR_CT); if (ofc->flags & NX_CT_F_COMMIT) { - nl_msg_put_flag(ctx->odp_actions, OVS_CT_ATTR_COMMIT); + nl_msg_put_flag(ctx->odp_actions, ofc->flags & NX_CT_F_FORCE ? + OVS_CT_ATTR_FORCE_COMMIT : OVS_CT_ATTR_COMMIT); } nl_msg_put_u16(ctx->odp_actions, OVS_CT_ATTR_ZONE, zone); put_ct_mark(&ctx->xin->flow, ctx->odp_actions, ctx->wc); |