On Thu, Aug 11, 2016 at 8:09 AM, nickcooper-zhangtonghao < nickcooper-zhangtong...@opencloud.tech> wrote:
> > > On Aug 7, 2016, at 7:22 AM, Ryan Moats <rmo...@us.ibm.com> wrote: > > > > > From: nickcooper-zhangtonghao <nickcooper-zhangtong...@opencloud.tech > <mailto:nickcooper-zhangtong...@opencloud.tech>> > > > To: dev@openvswitch.org <mailto:dev@openvswitch.org> > > > Cc: nickcooper-zhangtonghao <nickcooper-zhangtong...@opencloud.tech > <mailto:nickcooper-zhangtong...@opencloud.tech>> > > > Date: 08/06/2016 07:18 AM > > > Subject: [ovs-dev] [PATCH] ovn-controller: Remove the repeated code. > > > Sent by: "dev" <dev-boun...@openvswitch.org <mailto:dev-bounces@ > openvswitch.org>> > > > > > > Signed-off-by: nickcooper-zhangtonghao <nickcooper- > > > zhangtong...@opencloud.tech> > > > --- > > > ovn/controller/lflow.c | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c > > > index fda10eb..e22923b 100644 > > > --- a/ovn/controller/lflow.c > > > +++ b/ovn/controller/lflow.c > > > @@ -595,7 +595,6 @@ consider_logical_flow(const struct lport_index > *lports, > > > } > > > ofctrl_add_flow(ptable, lflow->priority, &m->match, &conj, > > > &lflow->header_.uuid); > > > - ofpbuf_uninit(&conj); > > > ofpbuf_uninit(&conj); > > > } > > > } > > > > git blame shows what happened with this one - I didn't resolve one of > > the merge conflicts between fdbdb595 and a53d69c9 correctly > > > > Double checked it with 25 cycles of ovn unit tests running with -j4 > > and it looks fine, so... > > > > Acked-by: Ryan Moats <rmo...@us.ibm.com <mailto:rmo...@us.ibm.com>> > > > Yes, the repeated code should be removed. Thanks, I applied this patch to master. -- Russell Bryant _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
