Merge branch 'frr/pull/557'

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

diff --cc bgpd/bgp_vty.c
index 418765424434f3b3a941bafdfbcc7de2ace408c7,f71d03e46bc97ebfeef8de091d276fe4b1222bba..9d5a4bd1cf41a6eaae29e22b9d79c1da4de472e7
--- 1/bgpd/bgp_vty.c
--- 2/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@@ -2894,10 -2896,14 +2899,11 @@@ peer_conf_interface_get (struct vty *vt
         * gets deleted later etc.)
         */
        if (peer->ifp)
 -        {
 -          bgp_zebra_initiate_radv (bgp, peer);
 -        }
 -      peer_flag_set (peer, PEER_FLAG_CAPABILITY_ENHE);
 +        bgp_zebra_initiate_radv (bgp, peer);
      }
-   else if ((v6only && !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) ||
-            (!v6only && CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)))
+ 
+   if ((v6only && !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) ||
+       (!v6only && CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)))
      {
        if (v6only)
          SET_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY);

diff --cc bgpd/bgpd.c
Simple merge