From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 9 Aug 2017 19:34:10 +0000 (+0200)
Subject: Merge branch 'frr/pull/822' ("EVPN fixes")
X-Git-Tag: frr-4.0-dev~431
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=695bb8f0d144def36295bd5af8b14fbf064b97b8;p=mirror%2Ffrr.git

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

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

695bb8f0d144def36295bd5af8b14fbf064b97b8
diff --cc lib/zclient.h
index 5edb56f517,67da45e13f..15d1858d84
--- a/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);