From: John Lo <loj@cisco.com>
Date: Tue, 27 Sep 2016 16:05:00 +0000 (-0400)
Subject: Fix "show adj nbr" displaying IP4 address for IP6 neighbors
X-Git-Tag: v17.01-rc0~162
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=719311ba824a90641c08c387cf9e7fa49676edc8;p=vpp.git

Fix "show adj nbr" displaying IP4 address for IP6 neighbors

Change-Id: Ic453e68bbd3d5ae8d57b513da6781bb957fc84a4
Signed-off-by: John Lo <loj@cisco.com>
---

diff --git a/vnet/vnet/adj/adj_nbr.c b/vnet/vnet/adj/adj_nbr.c
index 7da1becd4c1..de137d1dac0 100644
--- a/vnet/vnet/adj/adj_nbr.c
+++ b/vnet/vnet/adj/adj_nbr.c
@@ -721,7 +721,7 @@ format_adj_nbr_incomplete (u8* s, va_list *ap)
 
     s = format (s, "arp-%U", format_fib_link, adj->ia_link);
     s = format (s, ": via %U",
-                format_ip46_address, &adj->sub_type.nbr.next_hop);
+                format_ip46_address, &adj->sub_type.nbr.next_hop, IP46_TYPE_ANY);
     s = format (s, " %U",
                 format_vnet_sw_interface_name,
                 vnm,
@@ -741,7 +741,7 @@ format_adj_nbr (u8* s, va_list *ap)
 
     s = format (s, "%U", format_fib_link, adj->ia_link);
     s = format (s, " via %U ",
-		format_ip46_address, &adj->sub_type.nbr.next_hop);
+		format_ip46_address, &adj->sub_type.nbr.next_hop, IP46_TYPE_ANY);
     s = format (s, "%U",
 		format_vnet_rewrite,
 		vnm->vlib_main, &adj->rewrite_header, sizeof (adj->rewrite_data), 0);