Merge branch 'frr/pull/822' ("EVPN fixes")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc lib/command.c
Simple merge

diff --cc lib/command.h
Simple merge

diff --cc lib/log.c
Simple merge

diff --cc lib/zclient.h
index 5edb56f517cb37e02a4f05a822def906659e4972,67da45e13f0dec09750b7926c4a2f02db59de30c..15d1858d84aea8d4c5cd5269c13cb112955a8510
--- 1/lib/zclient.h
--- 2/lib/zclient.h
+++ b/lib/zclient.h
@@@ -286,25 -267,10 +287,29 @@@ struct zapi_ipv4 
        vrf_id_t vrf_id;
  };
  
 +struct zapi_pw {
 +      char ifname[IF_NAMESIZE];
 +      ifindex_t ifindex;
 +      int type;
 +      int af;
 +      union g_addr nexthop;
 +      uint32_t local_label;
 +      uint32_t remote_label;
 +      uint8_t flags;
 +      union pw_protocol_fields data;
 +      uint8_t protocol;
 +};
 +
 +struct zapi_pw_status {
 +      char ifname[IF_NAMESIZE];
 +      ifindex_t ifindex;
 +      uint32_t status;
 +};
 +
+ /* Zebra MAC types */
+ #define ZEBRA_MAC_TYPE_STICKY                0x01 /* Sticky MAC*/
+ #define ZEBRA_MAC_TYPE_GW                    0x02 /* gateway (SVI) mac*/
+ 
  /* Prototypes of zebra client service functions. */
  extern struct zclient *zclient_new(struct thread_master *);
  extern void zclient_init(struct zclient *, int, u_short);

diff --cc vtysh/vtysh.c
Simple merge

diff --cc vtysh/vtysh_config.c
Simple merge

diff --cc zebra/zebra_mpls.c
Simple merge

diff --cc zebra/zebra_vrf.h
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zserv.c
Simple merge