zebra: use the afi parameter in rib_add_multipath()

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 039fac4e67d5a9aace331eb5f47060e49502f007..7c43c38f4281abe05518bac8db2ce4ad694c1d27 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -526,7 +526,7 @@ static int netlink_route_change_read_unicast(struct sockaddr_nl *snl,
                        if (re->nexthop_num == 0)
                                XFREE(MTYPE_RE, re);
                        else
-                               rib_add_multipath(AFI_IP, SAFI_UNICAST, &p,
+                               rib_add_multipath(afi, SAFI_UNICAST, &p,
                                                  NULL, re);
                }
        } else {

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index bb496633191a3934b06964ea52a8d8144960c49e..7c140598c2adc09c0b1d469970386fc0ec7ffe79 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -2216,20 +2216,14 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
        struct route_entry *same;
        struct nexthop *nexthop;
        int ret = 0;
-       int family;
 
        if (!re)
                return 0;
 
-       if (p->family == AF_INET)
-               family = AFI_IP;
-       else
-               family = AFI_IP6;
-
-       assert(!src_p || family == AFI_IP6);
+       assert(!src_p || afi == AFI_IP6);
 
        /* Lookup table.  */
-       table = zebra_vrf_table_with_table_id(family, safi, re->vrf_id,
+       table = zebra_vrf_table_with_table_id(afi, safi, re->vrf_id,
                                              re->table);
        if (!table)
                return 0;