Skip to content

Commit

Permalink
ovn-northd: Don't shadow addr_family in add_router_lb_flow().
Browse files Browse the repository at this point in the history
This is a partial backport of commit 396d492 ("Don't shadow
variables.") to fix a build break due to backporting a different commit
that depended on it.

Reported-by: Flavio Leitner <fbl@sysclose.org>
CC: Mark Michelson <mmichels@redhat.com>
Fixes: 15fbc3b ("ovn: Add router load balancer undnat rule for IPv6")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Acked-by: Mark Michelson <mmichels@redhat.com>
  • Loading branch information
blp committed Jul 11, 2018
1 parent 15fbc3b commit 6caf790
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ovn/northd/ovn-northd.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 6caf790

Please sign in to comment.