diff options
| author | Mitesh Kanjariya <mitesh@cumulusnetworks.com> | 2018-03-12 14:47:28 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 14:47:28 -0700 | 
| commit | 9bb3ca515b59b939c5d9941c4fdd4bd2f2dd38d1 (patch) | |
| tree | 5fb91642f1bbc24e10e74a768f46c659b215205b /bgpd/bgp_evpn.h | |
| parent | 7b1bf203ca189938b41811945fe6a71911574de3 (diff) | |
| parent | 9d16566bb3fbe7a9e15eb8d0cc51bcc3f7997e50 (diff) | |
Merge branch 'master' into type5-default-originate
Diffstat (limited to 'bgpd/bgp_evpn.h')
| -rw-r--r-- | bgpd/bgp_evpn.h | 17 | 
1 files changed, 7 insertions, 10 deletions
diff --git a/bgpd/bgp_evpn.h b/bgpd/bgp_evpn.h index 3a3ffeb293..7c0d638327 100644 --- a/bgpd/bgp_evpn.h +++ b/bgpd/bgp_evpn.h @@ -76,10 +76,9 @@ static inline int advertise_type5_routes(struct bgp *bgp_vrf,  extern void bgp_evpn_advertise_type5_route(struct bgp *bgp_vrf,  					   struct prefix *p, -					   struct attr *src_attr, -					   afi_t afi, safi_t safi); -extern void bgp_evpn_withdraw_type5_route(struct bgp *bgp_vrf, -					  struct prefix *p, +					   struct attr *src_attr, afi_t afi, +					   safi_t safi); +extern void bgp_evpn_withdraw_type5_route(struct bgp *bgp_vrf, struct prefix *p,  					  afi_t afi, safi_t safi);  extern void bgp_evpn_withdraw_type5_routes(struct bgp *bgp_vrf, afi_t afi,  					   safi_t safi); @@ -92,10 +91,9 @@ extern char *bgp_evpn_label2str(mpls_label_t *label, u_int32_t num_labels,  extern char *bgp_evpn_route2str(struct prefix_evpn *p, char *buf, int len);  extern void bgp_evpn_route2json(struct prefix_evpn *p, json_object *json);  extern void bgp_evpn_encode_prefix(struct stream *s, struct prefix *p, -				   struct prefix_rd *prd, -				   mpls_label_t *label, u_int32_t num_labels, -				   struct attr *attr, int addpath_encode, -				   u_int32_t addpath_tx_id); +				   struct prefix_rd *prd, mpls_label_t *label, +				   u_int32_t num_labels, struct attr *attr, +				   int addpath_encode, u_int32_t addpath_tx_id);  extern int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,  			       struct bgp_nlri *packet, int withdraw);  extern int bgp_evpn_import_route(struct bgp *bgp, afi_t afi, safi_t safi, @@ -110,8 +108,7 @@ extern int bgp_evpn_local_macip_add(struct bgp *bgp, vni_t vni,  				    u_char flags);  extern int bgp_evpn_local_l3vni_add(vni_t vni, vrf_id_t vrf_id,  				    struct ethaddr *rmac, -				    struct in_addr originator_ip, -				    int filter); +				    struct in_addr originator_ip, int filter);  extern int bgp_evpn_local_l3vni_del(vni_t vni, vrf_id_t vrf_id);  extern int bgp_evpn_local_vni_del(struct bgp *bgp, vni_t vni);  extern int bgp_evpn_local_vni_add(struct bgp *bgp, vni_t vni,  | 
