X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_format.c;h=c62e770e57b006ea24976493334553dca152d4f8;hb=5100aa9cb;hp=7e94092b52e3d2f430d1324005190d2ddc943f17;hpb=a35cc14d37466f0737fa928d25697fbfe6e7d657;p=vpp.git

diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index 7e94092b52e..c62e770e57b 100644
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -77,6 +77,24 @@ format_vnet_hw_interface_rx_mode (u8 * s, va_list * args)
   return format (s, "unknown");
 }
 
+u8 *
+format_vnet_hw_interface_link_speed (u8 * s, va_list * args)
+{
+  u32 link_speed = va_arg (*args, u32);
+
+  if (link_speed == 0)
+    return format (s, "unknown");
+
+  if (link_speed >= 1000000)
+    return format (s, "%f Gbps", (f64) link_speed / 1000000);
+
+  if (link_speed >= 1000)
+    return format (s, "%f Mbps", (f64) link_speed / 1000);
+
+  return format (s, "%u Kbps", link_speed);
+}
+
+
 u8 *
 format_vnet_hw_interface (u8 * s, va_list * args)
 {
@@ -115,6 +133,9 @@ format_vnet_hw_interface (u8 * s, va_list * args)
   else
     s = format (s, "%s%d", dev_class->name, hi->dev_instance);
 
+  s = format (s, "\n%ULink speed: %U", format_white_space, indent + 2,
+	      format_vnet_hw_interface_link_speed, hi->link_speed);
+
   if (verbose)
     {
       if (hw_class->format_device)
@@ -291,6 +312,16 @@ format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
   return s;
 }
 
+static u8 *
+format_vnet_sw_interface_mtu (u8 * s, va_list * args)
+{
+  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
+
+  return format (s, "%d/%d/%d/%d", si->mtu[VNET_MTU_L3],
+		 si->mtu[VNET_MTU_IP4],
+		 si->mtu[VNET_MTU_IP6], si->mtu[VNET_MTU_MPLS]);
+}
+
 u8 *
 format_vnet_sw_interface (u8 * s, va_list * args)
 {
@@ -299,12 +330,14 @@ format_vnet_sw_interface (u8 * s, va_list * args)
   vnet_interface_main_t *im = &vnm->interface_main;
 
   if (!si)
-    return format (s, "%=32s%=5s%=16s%=16s%=16s",
-		   "Name", "Idx", "State", "Counter", "Count");
+    return format (s, "%=32s%=5s%=10s%=21s%=16s%=16s",
+		   "Name", "Idx", "State", "MTU (L3/IP4/IP6/MPLS)", "Counter",
+		   "Count");
 
-  s = format (s, "%-32U%=5d%=16U",
+  s = format (s, "%-32U%=5d%=10U%=21U",
 	      format_vnet_sw_interface_name, vnm, si, si->sw_if_index,
-	      format_vnet_sw_interface_flags, si->flags);
+	      format_vnet_sw_interface_flags, si->flags,
+	      format_vnet_sw_interface_mtu, si);
 
   s = format_vnet_sw_interface_cntrs (s, im, si);