From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 2 Aug 2017 13:39:38 +0000 (-0400)
Subject: Merge branch 'master' into PIM_VRF
X-Git-Tag: frr-4.0-dev~468^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0ecfe5bf38cd803aef891fb9bedb5633949b39bc;p=mirror%2Ffrr.git

Merge branch 'master' into PIM_VRF
---

0ecfe5bf38cd803aef891fb9bedb5633949b39bc
diff --cc vtysh/vtysh.h
index 57a25132a2,bef4b82d3f..b0866ec7f3
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@@ -44,10 -44,10 +44,10 @@@ DECLARE_MGROUP(MVTYSH
   * run on it (logging & co. should stay in a fixed/frozen config, and
   * things like prefix lists are not even initialised) */
  #define VTYSH_ALL	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD
- #define VTYSH_RMAP	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD
+ #define VTYSH_RMAP	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD|VTYSH_EIGRPD
  #define VTYSH_INTERFACE	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD
  #define VTYSH_NS          VTYSH_ZEBRA
 -#define VTYSH_VRF	  VTYSH_ZEBRA
 +#define VTYSH_VRF	  VTYSH_ZEBRA|VTYSH_PIMD
  
  /* vtysh local configuration file. */
  #define VTYSH_DEFAULT_CONFIG "vtysh.conf"
diff --cc zebra/rt_socket.c
index 699fe6eb24,0eae3c4f25..4e4d726b46
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@@ -444,8 -447,4 +447,10 @@@ int kernel_del_neigh(struct interface *
  	return 0;
  }
  
 +extern int kernel_interface_set_master(struct interface *master,
 +				       struct interface *slave)
 +{
 +	return 0;
 +}
++
+ #endif /* !HAVE_NETLINK */