Small additions

diff --git a/proto/evpn/config.Y b/proto/evpn/config.Y
index 8c5e998c40552145af69965141d666c13d426852..fc3734f1c7e9d7baaedc77a479309c73fa1cef6f 100644 (file)
--- a/proto/evpn/config.Y
+++ b/proto/evpn/config.Y
@@ -53,6 +53,8 @@ evpn_proto_start: proto_start EVPN
   this_proto = proto_config_new(&proto_evpn, $1);
   init_list(&EVPN_CFG->vlans);
   init_list(&EVPN_CFG->encaps);
+
+  EVPN_CFG->vni = EVPN_VNI_NOT_SET;
 };
 
 
@@ -95,7 +97,7 @@ evpn_encap_start: ENCAPSULATION VXLAN
   add_tail(&EVPN_CFG->encaps, &this_evpn_encap->n);
 
   this_evpn_encap->type        = EVPN_ENCAP_TYPE_VXLAN;
-  this_evpn_encap->router_addr = IP6_NONE;
+  this_evpn_encap->router_addr = IPA_NONE;
   this_evpn_encap->is_default  = false;
 }
 

diff --git a/proto/evpn/evpn.c b/proto/evpn/evpn.c
index 376344f1668ba3d68cc0bdbbe82b2a94261f46c2..a4c2cdbab72587dba0fbe11b7e10c72bdaf8f766 100644 (file)
--- a/proto/evpn/evpn.c
+++ b/proto/evpn/evpn.c
@@ -208,7 +208,7 @@ evpn_announce_mac(struct evpn_proto *p, const net_addr_eth *n0, rte *new)
  * (and only) encapsulation. If there were more encapsulation types, we would
  * have to choose one here.
  */
-static struct evpn_encap *
+static inline struct evpn_encap *
 evpn_get_encap(struct evpn_proto *p)
 {
   ASSERT(list_length(&p->encaps) == 1);

diff --git a/proto/evpn/evpn.h b/proto/evpn/evpn.h
index ba4fa4efc315b45f5dad95d37ffbd4b349ea02ca..8994b699d7df55e67bc9f1a8f5e6a5ac8ceb62fa 100644 (file)
--- a/proto/evpn/evpn.h
+++ b/proto/evpn/evpn.h
@@ -10,6 +10,8 @@
 #ifndef _BIRD_EVPN_H_
 #define _BIRD_EVPN_H_
 
+#define EVPN_VNI_NOT_SET  (u32)-1
+
 struct evpn_config {
   struct proto_config c;