Merge commit '3d22338f04d9554fa' into evpn-prep

Conflicts:
	lib/Makefile.am

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

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_packet.c
Simple merge

diff --cc bgpd/bgp_route.c
index abd6d73e76592a75475d0bb493c34b9d9b809d02,a69e7a4d5cf55c0275e9b736170ecc434e0709c0..12ad65883ea2d8e36d8c97a075300875d577f828
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -4622,13 -4605,15 +4622,15 @@@ bgp_static_set_safi (afi_t afi, safi_t 
            ret = str2prefix (gwip, &gw_ip);
            if (! ret)
              {
 -              vty_out (vty, "%% Malformed GatewayIp%s", VTY_NEWLINE);
 +              vty_outln (vty, "%% Malformed GatewayIp");
                return CMD_WARNING;
              }
-           if((gw_ip.family == AF_INET &&  (p.u.prefix_evpn.flags & IP_PREFIX_V6))
-              || (gw_ip.family == AF_INET6 &&  (p.u.prefix_evpn.flags & IP_PREFIX_V4)))
+           if((gw_ip.family == AF_INET &&
+               IS_EVPN_PREFIX_IPADDR_V6((struct prefix_evpn *)&p)) ||
+              (gw_ip.family == AF_INET6 &&
+               IS_EVPN_PREFIX_IPADDR_V4((struct prefix_evpn *)&p)))
              {
 -              vty_out (vty, "%% GatewayIp family differs with IP prefix%s", VTY_NEWLINE);
 +              vty_outln (vty, "%% GatewayIp family differs with IP prefix");
                return CMD_WARNING;
              }
          }

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc lib/Makefile.am
index e1b84587da15b1d34bb294b5c733cc6167418882,3e321998666b6f1ddac2aaf8d788b6fc07f1a15d..5847ad49395a60859d2ffb8e66aa3996756c958d
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -85,7 -81,9 +85,10 @@@ pkginclude_HEADERS = 
        sha256.h \
        frr_pthread.h \
        vrf_int.h \
 +      termtable.h \
+       vlan.h \
+       vxlan.h \
+       ipaddr.h \
        # end
  
  noinst_HEADERS = \

diff --cc lib/hash.h
index 9395440acbf9ede99d0b219a876bbe9c3476c3fe,319ba9f7f9eaef4287461e014e9510e818870931..01d2b1ddc86c16e1ec389be91fa387e6ab1affcd
--- 1/lib/hash.h
--- 2/lib/hash.h
+++ b/lib/hash.h
@@@ -77,19 -64,14 +77,21 @@@ struct has
  
    /* Backet alloc. */
    unsigned long count;
 +
 +  struct hashstats stats;
 +
 +  /* hash name */
 +  char *name;
  };
  
+ #define hashcount(X) ((X)->count)
+ 
  extern struct hash *hash_create (unsigned int (*) (void *), 
 -                               int (*) (const void *, const void *));
 +                               int (*) (const void *, const void *),
 +                               const char *);
  extern struct hash *hash_create_size (unsigned int, unsigned int (*) (void *), 
 -                                    int (*) (const void *, const void *));
 +                                    int (*) (const void *, const void *),
 +                                    const char *);
  
  extern void *hash_get (struct hash *, void *, void * (*) (void *));
  extern void *hash_alloc_intern (void *);

diff --cc lib/prefix.c
Simple merge

diff --cc lib/prefix.h
Simple merge

diff --cc zebra/if_netlink.c
Simple merge

diff --cc zebra/kernel_netlink.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge