Merge pull request #2124 from donaldsharp/missed

bgpd, zebra: Handle EVPN router MAC per next hop

diff --cc bgpd/bgp_zebra.c
index 93a509c219c30477f694311a0bd397429bc3639c,51bdacf36bb526d43786f881a3ade1a608a07a90..7bb01b60aaf5aeafeb57b0b17bd5309fdbc48b43
--- 1/bgpd/bgp_zebra.c
--- 2/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@@ -1493,14 -1387,7 +1494,13 @@@ void bgp_zebra_withdraw(struct prefix *
        if (!bgp_install_info_to_zebra(bgp))
                return;
  
 +      if (safi == SAFI_FLOWSPEC) {
 +              peer = info->peer;
 +              return bgp_pbr_update_entry(peer->bgp, p,
 +                                          info, AFI_IP, safi, false);
 +      }
 +
        memset(&api, 0, sizeof(api));
-       memcpy(&api.rmac, &(info->attr->rmac), sizeof(struct ethaddr));
        api.vrf_id = bgp->vrf_id;
        api.type = ZEBRA_ROUTE_BGP;
        api.safi = safi;

diff --cc lib/zclient.c
Simple merge

diff --cc lib/zclient.h
Simple merge

diff --cc zebra/kernel_socket.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge