Merge branch 'master' into PIM_VRF

diff --cc vtysh/vtysh.h
index 57a25132a20a6f00b5c585eb933e8ce25eac6038,bef4b82d3fb3f336f2bb0c48ca60284163973c61..b0866ec7f3fa20e22ce051041a6c79755e700229
--- 1/vtysh/vtysh.h
--- 2/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/if_netlink.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/rt_socket.c
index 699fe6eb24ebc19e042e444109a01e586c2ed0f1,0eae3c4f25d07eee9495ee1f8499c8221982017c..4e4d726b4618042ad7878bc0f073a7d40582bc39
--- 1/zebra/rt_socket.c
--- 2/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 */