Output format change from "vlan 802.1q" to "802.1q vlan", addition to VPP-111

Change-Id: Ieac14c88e6f0d2d88da1fe47f981fa33ae6f7c23
Signed-off-by: marek zavodsky <mazavods@gmail.com>

diff --git a/vnet/vnet/devices/dpdk/format.c b/vnet/vnet/devices/dpdk/format.c
index a8b0363..68e4c45 100644 (file)
--- a/vnet/vnet/devices/dpdk/format.c
+++ b/vnet/vnet/devices/dpdk/format.c
@@ -681,7 +681,7 @@ u8 * format_dpdk_rte_mbuf_vlan (u8 * s, va_list * va)
     ethernet_vlan_header_tv_t * vlan_hdr = va_arg (*va, ethernet_vlan_header_tv_t *);
 
     if (clib_net_to_host_u16(vlan_hdr->type) == ETHERNET_TYPE_DOT1AD) {
-          s = format (s, "%U vlan 802.1q ",
+          s = format (s, "%U 802.1q vlan ",
                   format_ethernet_vlan_tci,
                   clib_net_to_host_u16(vlan_hdr->priority_cfi_and_id));
         vlan_hdr++;

diff --git a/vnet/vnet/ethernet/format.c b/vnet/vnet/ethernet/format.c
index 0e581ff..175d7fb 100644 (file)
--- a/vnet/vnet/ethernet/format.c
+++ b/vnet/vnet/ethernet/format.c
@@ -75,7 +75,7 @@ u8 * format_ethernet_vlan_tci (u8 * s, va_list * va)
     u32 cfi = (vlan_tci >> 12) & 1;
     u32 pri = (vlan_tci >> 13);
 
-    s = format (s, "id %d", vid);
+    s = format (s, "%d", vid);
     if (pri != 0)
         s = format (s, " priority %d", pri);
     if (cfi != 0)
@@ -120,9 +120,9 @@ u8 * format_ethernet_header_with_length (u8 * s, va_list * args)
     {
       u32 v = clib_net_to_host_u16 (m->vlan[i].priority_cfi_and_id);
       if (*vlan_type == ETHERNET_TYPE_VLAN)
-          s = format (s, " vlan 802.1q %U", format_ethernet_vlan_tci, v);
+          s = format (s, " 802.1q vlan %U", format_ethernet_vlan_tci, v);
       else
-          s = format (s, " vlan 802.1ad %U", format_ethernet_vlan_tci, v);
+          s = format (s, " 802.1ad vlan %U", format_ethernet_vlan_tci, v);
     }
 
   if (max_header_bytes != 0 && header_bytes < max_header_bytes)