]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #1806 from vivek-cumulus/evpn-ipv6-tenant-routing
authorPhilippe Guibert <philippe.guibert@6wind.com>
Tue, 13 Mar 2018 09:20:29 +0000 (10:20 +0100)
committerGitHub <noreply@github.com>
Tue, 13 Mar 2018 09:20:29 +0000 (10:20 +0100)
*: EVPN symmetric routing for IPv6 tenant routes

1  2 
bgpd/bgp_evpn.c
bgpd/bgp_evpn_vty.c
zebra/zserv.c

diff --cc bgpd/bgp_evpn.c
Simple merge
Simple merge
diff --cc zebra/zserv.c
index f53baf65d07d6f16bc8025d9d67f7e3d4699d655,9afffbda1e1002a10da27f0bdb11f3bc4efa442e..0def903803126b516c9b50ae609960c2f7d50cda
@@@ -1144,9 -1190,11 +1144,10 @@@ static void zread_route_add(ZAPI_HANDLE
        struct nexthop *nexthop = NULL;
        int i, ret;
        vrf_id_t vrf_id = 0;
+       struct ipaddr vtep_ip;
  
 -      s = client->ibuf;
 -      if (zapi_route_decode(s, &api) < 0)
 -              return -1;
 +      s = msg;
 +      zapi_route_decode(s, &api);
  
        /* Allocate new route. */
        vrf_id = zvrf_id(zvrf);