summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarek zavodsky <mazavods@gmail.com>2016-07-18 10:59:57 +0200
committermarek zavodsky <mazavods@gmail.com>2016-07-18 11:02:41 +0200
commited740a968ac54a64ca6771e097dc5f9b8edc5811 (patch)
tree8a230adf57935ba7b3b10f7f09a0cbf6882660ea
parent987fdfa125a8797ac4d659da42467a38432108f1 (diff)
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>
-rw-r--r--vnet/vnet/devices/dpdk/format.c2
-rw-r--r--vnet/vnet/ethernet/format.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/devices/dpdk/format.c b/vnet/vnet/devices/dpdk/format.c
index a8b0363317d..68e4c459beb 100644
--- 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 0e581ff9fa4..175d7fb6352 100644
--- 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)