Merge pull request #5541 from sworleys/NHG-Fixes

zebra: a couple nhg fixes
This commit is contained in:
Russ White 2019-12-17 08:30:37 -05:00 committed by GitHub
commit a91d3df894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -593,7 +593,7 @@ zebra_nhg_find_nexthop(uint32_t id, struct nexthop *nh, afi_t afi, int type)
nexthop_group_add_sorted(&nhg, nh);
zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, 0);
zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, type);
return nhe;
}

View File

@ -228,7 +228,7 @@ int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new)
if (old)
zebra_nhg_decrement_ref(old);
} else if (!re->nhe->nhg)
} else if (!re->nhe)
/* This is the first time it's being attached */
route_entry_attach_ref(re, new);