[ovs-dev] ofctrl: Fix logic for mff_ovn_geneve.
diff mbox

Message ID 1473424696-25411-1-git-send-email-guru@ovn.org
State Accepted
Headers show

Commit Message

Guru Shetty Sept. 9, 2016, 12:38 p.m. UTC
Fixes: 7fa39c6b9376e99 ("Fix memory leak in recv_S_TLV_TABLE_REQUESTED().")
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
---
 ovn/controller/ofctrl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Pfaff Sept. 9, 2016, 10:49 p.m. UTC | #1
On Fri, Sep 09, 2016 at 05:38:16AM -0700, Gurucharan Shetty wrote:
> Fixes: 7fa39c6b9376e99 ("Fix memory leak in recv_S_TLV_TABLE_REQUESTED().")
> Signed-off-by: Gurucharan Shetty <guru@ovn.org>
> ---
>  ovn/controller/ofctrl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
> index fe72d79..6ea593b 100644
> --- a/ovn/controller/ofctrl.c
> +++ b/ovn/controller/ofctrl.c
> @@ -220,7 +220,7 @@ process_tlv_table_reply(const struct ofputil_tlv_table_reply *reply)
>              } else {
>                  mff_ovn_geneve = MFF_TUN_METADATA0 + map->index;
>                  state = S_CLEAR_FLOWS;
> -                return false;
> +                return true;
>              }
>          }

Good catch, thanks.

Acked-by: Ben Pfaff <blp@ovn.org>
Flavio Fernandes Sept. 10, 2016, 3:39 a.m. UTC | #2
> On Sep 9, 2016, at 8:38 AM, Gurucharan Shetty <guru@ovn.org> wrote:
> 
> Fixes: 7fa39c6b9376e99 ("Fix memory leak in recv_S_TLV_TABLE_REQUESTED().")
> Signed-off-by: Gurucharan Shetty <guru@ovn.org>

Acked-by: Flavio Fernandes <flavio@flaviof.com>

> ---
> ovn/controller/ofctrl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
> index fe72d79..6ea593b 100644
> --- a/ovn/controller/ofctrl.c
> +++ b/ovn/controller/ofctrl.c
> @@ -220,7 +220,7 @@ process_tlv_table_reply(const struct ofputil_tlv_table_reply *reply)
>             } else {
>                 mff_ovn_geneve = MFF_TUN_METADATA0 + map->index;
>                 state = S_CLEAR_FLOWS;
> -                return false;
> +                return true;

duh!

>             }
>         }
> 
> --
> 1.9.1
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
Guru Shetty Sept. 11, 2016, 1:23 a.m. UTC | #3
On 9 September 2016 at 15:49, Ben Pfaff <blp@ovn.org> wrote:

> On Fri, Sep 09, 2016 at 05:38:16AM -0700, Gurucharan Shetty wrote:
> > Fixes: 7fa39c6b9376e99 ("Fix memory leak in
> recv_S_TLV_TABLE_REQUESTED().")
> > Signed-off-by: Gurucharan Shetty <guru@ovn.org>
> > ---
> >  ovn/controller/ofctrl.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
> > index fe72d79..6ea593b 100644
> > --- a/ovn/controller/ofctrl.c
> > +++ b/ovn/controller/ofctrl.c
> > @@ -220,7 +220,7 @@ process_tlv_table_reply(const struct
> ofputil_tlv_table_reply *reply)
> >              } else {
> >                  mff_ovn_geneve = MFF_TUN_METADATA0 + map->index;
> >                  state = S_CLEAR_FLOWS;
> > -                return false;
> > +                return true;
> >              }
> >          }
>
> Good catch, thanks.
>
> Acked-by: Ben Pfaff <blp@ovn.org>
>

Thank you for the reviews. I applied this to master and 2.6

Patch
diff mbox

diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
index fe72d79..6ea593b 100644
--- a/ovn/controller/ofctrl.c
+++ b/ovn/controller/ofctrl.c
@@ -220,7 +220,7 @@  process_tlv_table_reply(const struct ofputil_tlv_table_reply *reply)
             } else {
                 mff_ovn_geneve = MFF_TUN_METADATA0 + map->index;
                 state = S_CLEAR_FLOWS;
-                return false;
+                return true;
             }
         }