diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/debug.cpp | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/debug.cpp')
| -rw-r--r-- | src/debug.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/debug.cpp b/src/debug.cpp index 5a881dd9..4abd05a0 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -290,8 +290,8 @@ struct pkt_params { }; struct pkt_params test_pkts[] = { - {"ARP", 1, IPPROTO_UDP, 255, 5, 0, ZERO}, - {"VLAN ARP", 1, IPPROTO_UDP, 255, 5, DPF_VLAN, ZERO}, + {"ARP req", 1, IPPROTO_UDP, 255, 5, 0, ZERO}, + {"VLAN ARP req", 1, IPPROTO_UDP, 255, 5, DPF_VLAN, ZERO}, {"ipv4 TCP ttl 255", 4, IPPROTO_TCP, 255, 5, 0, STF}, {"ipv4 TCP ttl 246", 4, IPPROTO_TCP, 246, 5, 0, STF}, {"ipv4 TCP ttl 245", 4, IPPROTO_TCP, 245, 5, 0, ZERO}, @@ -398,7 +398,13 @@ int CTrexDebug::verify_hw_rules(bool recv_all) { memset(pkt_per_q, 0, sizeof(pkt_per_q)); // We don't know which interfaces connected where, so sum all queue 1 and all queue 0 for (int port = 0; port < m_max_ports; port++) { - for(int queue_id = 0; queue_id <= 1; queue_id++) { + int max_q; + if (CGlobalInfo::m_options.preview.get_vm_one_queue_enable()) { + max_q = 0; + } else { + max_q = 1; + } + for(int queue_id = 0; queue_id <= max_q; queue_id++) { lp = &m_ports[port]; uint16_t cnt = lp->rx_burst(queue_id, rx_pkts, 32); pkt_per_q[queue_id] += cnt; |