Merge pull request #2050 from chipitsine/master

resolve issue found by cppcheck
This commit is contained in:
Russ White 2018-04-11 09:08:51 -04:00 committed by GitHub
commit 08097fedd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5774,10 +5774,12 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, struct prefix *p,
NULL; /* link info for the SVI = bridge info */
svi_if_zif = ifp->info;
svi_if_link = if_lookup_by_index_per_ns(
zebra_ns_lookup(NS_DEFAULT), svi_if_zif->link_ifindex);
if (svi_if_zif && svi_if_link)
zvni = zvni_from_svi(ifp, svi_if_link);
if (svi_if_zif) {
svi_if_link = if_lookup_by_index_per_ns(
zebra_ns_lookup(NS_DEFAULT), svi_if_zif->link_ifindex);
if (svi_if_link)
zvni = zvni_from_svi(ifp, svi_if_link);
}
} else if (IS_ZEBRA_IF_BRIDGE(ifp)) {
zvni = zvni_from_svi(ifp, ifp);
}