diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-06 22:19:24 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-06 22:19:24 +0000 |
| commit | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (patch) | |
| tree | dfb478c984f1aeb74f0c35c9c7b8b11577cb9833 /zebra/zserv.c | |
| parent | 558283638bb50ff24ea28bab89c1bb4c89ccc3dd (diff) | |
| parent | defd0965f4a85a392e29032f712617e3c617596d (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
zebra/zserv.c
Diffstat (limited to 'zebra/zserv.c')
| -rw-r--r-- | zebra/zserv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c index 1fc2bfd309..07258cdb72 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1167,12 +1167,12 @@ static int zread_route_add(struct zserv *client, u_short length, switch (api_nh->type) { case NEXTHOP_TYPE_IFINDEX: nexthop = route_entry_nexthop_ifindex_add( - re, api_nh->ifindex, re->vrf_id); + re, api_nh->ifindex, api_nh->vrf_id); break; case NEXTHOP_TYPE_IPV4: nexthop = route_entry_nexthop_ipv4_add( re, &api_nh->gate.ipv4, NULL, - re->vrf_id); + api_nh->vrf_id); break; case NEXTHOP_TYPE_IPV4_IFINDEX: @@ -1187,7 +1187,7 @@ static int zread_route_add(struct zserv *client, u_short length, nexthop = route_entry_nexthop_ipv4_ifindex_add( re, &api_nh->gate.ipv4, NULL, ifindex, - re->vrf_id); + api_nh->vrf_id); /* if this an EVPN route entry, * program the nh as neigh @@ -1209,7 +1209,7 @@ static int zread_route_add(struct zserv *client, u_short length, break; case NEXTHOP_TYPE_IPV6: nexthop = route_entry_nexthop_ipv6_add( - re, &api_nh->gate.ipv6, re->vrf_id); + re, &api_nh->gate.ipv6, api_nh->vrf_id); break; case NEXTHOP_TYPE_IPV6_IFINDEX: memset(&vtep_ip, 0, sizeof(struct ipaddr)); @@ -1223,7 +1223,7 @@ static int zread_route_add(struct zserv *client, u_short length, nexthop = route_entry_nexthop_ipv6_ifindex_add( re, &api_nh->gate.ipv6, ifindex, - re->vrf_id); + api_nh->vrf_id); /* if this an EVPN route entry, * program the nh as neigh |