Thanks for the fast review, Joe! Series pushed to master, branch-2.6, and branch-2.5.
Jarno > On Sep 27, 2016, at 2:38 PM, Joe Stringer <j...@ovn.org> wrote: > > On 27 September 2016 at 14:32, Jarno Rajahalme <ja...@ovn.org > <mailto:ja...@ovn.org>> wrote: >> We can't downgrade to OF1.0 and expect inconsistent CT actions >> be silently disgarded. Instead, datapath flow install fails, so >> it is better to flag inconsistent CT actions as hard errors. >> >> Signed-off-by: Jarno Rajahalme <ja...@ovn.org <mailto:ja...@ovn.org>> > > LGTM, minor spelling below. Thanks. > > Acked-by: Joe Stringer <j...@ovn.org <mailto:j...@ovn.org>> > >> --- >> lib/ofp-actions.c | 7 +++++-- >> tests/ofproto-dpif.at | 40 ++++++++++++++++++++-------------------- >> tests/ovs-ofctl.at | 46 +++++++++++++++++++++++----------------------- >> 3 files changed, 48 insertions(+), 45 deletions(-) >> >> diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c >> index f896f98..19e47fb 100644 >> --- a/lib/ofp-actions.c >> +++ b/lib/ofp-actions.c >> @@ -7033,7 +7033,10 @@ ofpact_check__(enum ofputil_protocol >> *usable_protocols, struct ofpact *a, >> if (!dl_type_is_ip_any(flow->dl_type) >> || (flow->ct_state & CS_INVALID && oc->flags & NX_CT_F_COMMIT) >> || (oc->alg == IPPORT_FTP && flow->nw_proto != IPPROTO_TCP)) { >> - inconsistent_match(usable_protocols); >> + /* We can't downgrade to OF1.0 and expect inconsistent CT >> actions >> + * be silently disgarded. Instead, datapath flow install >> fails, so > > *discarded _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
