On Mon, Jun 15, 2015 at 1:58 PM, Ben Pfaff <b...@nicira.com> wrote:
> It doesn't make sense to mix "conjunction" actions with most other kinds
> of actions. That's because flows with "conjunction" actions aren't ever
> actually executed, so any actions mixed up with them would never do
> anything useful. "note" actions are a little different because they never
> do anything useful anyway: they are just there to allow a controller to
> annotate flows. It makes as much sense to annotate a flow with
> "conjunction" actions as it does to annotate any other flow, so this
> commit makes this possible.
>
> Requested-by: Soner Sevinc <sevi...@vmware.com>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> -
> static void
> get_conjunctions(const struct ofputil_flow_mod *fm,
> struct cls_conjunction **conjsp, size_t *n_conjsp)
> @@ -4420,23 +4414,31 @@ get_conjunctions(const struct ofputil_flow_mod *fm,
> struct cls_conjunction *conjs = NULL;
> int n_conjs = 0;
>
> - if (is_conjunction(fm->ofpacts, fm->ofpacts_len)) {
> - const struct ofpact *ofpact;
> - int i;
> + n_conjs = 0;
I don't think this line is necessary. Otherwise, looks good.
Acked-by: Andy Zhou <az...@nicira.com>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
