Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr

[mirror_frr.git] / ripngd / ripng_peer.c

diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c
index 69af4f214f7120ff109eb7e45f6863a1a73787a4..51f1a40097c638b9ccd04e698f9fb4ab3ae1cef5 100644 (file)
--- a/ripngd/ripng_peer.c
+++ b/ripngd/ripng_peer.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* RIPng support added by Vincent Jardin <vincent.jardin@6wind.com>
@@ -194,12 +193,11 @@ ripng_peer_display (struct vty *vty)
 
   for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
     {
-      vty_out (vty, "    %s %s%14s %10d %10d %10d      %s%s", inet6_ntoa (peer->addr),
-               VTY_NEWLINE, " ",
+      vty_outln (vty, "    %s %s%14s %10d %10d %10d      %s", inet6_ntoa (peer->addr),
+               VTYNL, " ",
               peer->recv_badpackets, peer->recv_badroutes,
               ZEBRA_RIPNG_DISTANCE_DEFAULT,
-              ripng_peer_uptime (peer, timebuf, RIPNG_UPTIME_LEN),
-              VTY_NEWLINE);
+              ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN));
     }
 }