[ovs-dev] [PATCH branch-2.9] ovn-northd: Don't shadow addr_family in add_router_lb_flow().

[Mark Michelson]

Thanks, Ben!

Acked-by: Mark Michelson <mmichels at redhat.com>

On 07/10/2018 06:24 PM, Ben Pfaff wrote:
> This is a partial backport of commit 396d492cfa8d ("Don't shadow
> variables.") to fix a build break due to backporting a different commit
> that depended on it.
> 
> CC: Mark Michelson <mmichels at redhat.com>
> Fixes: 15fbc3baee5a ("ovn: Add router load balancer undnat rule for IPv6")
> Signed-off-by: Ben Pfaff <blp at ovn.org>
> ---
>   ovn/northd/ovn-northd.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
> index 2509b0a57320..334aa6f8c742 100644
> --- a/ovn/northd/ovn-northd.c
> +++ b/ovn/northd/ovn-northd.c
> @@ -4463,9 +4463,9 @@ add_router_lb_flow(struct hmap *lflows, struct ovn_datapath *od,
>       while (ip_str && ip_str[0]) {
>           char *ip_address = NULL;
>           uint16_t port = 0;
> -        int addr_family;
> +        int addr_family_;
>           ip_address_and_port_from_lb_key(ip_str, &ip_address, &port,
> -                                        &addr_family);
> +                                        &addr_family_);
>           if (!ip_address) {
>               break;
>           }
>