acl-plugin: refactor the "show acl-plugin" CLI, use vlib_cli_output() vs. format()

[vpp.git] / src / plugins / dpdk / hqos / hqos.c

diff --git a/src/plugins/dpdk/hqos/hqos.c b/src/plugins/dpdk/hqos/hqos.c
index 2f2504d..c9b8565 100644 (file)
--- a/src/plugins/dpdk/hqos/hqos.c
+++ b/src/plugins/dpdk/hqos/hqos.c
@@ -29,7 +29,6 @@
 #include <vnet/ethernet/ethernet.h>
 #include <dpdk/device/dpdk.h>
 
-#include <vlib/unix/physmem.h>
 #include <vlib/pci/pci.h>
 #include <vlibmemory/api.h>
 #include <vlibmemory/vl_memory_msg_enum.h>     /* enumerate all vlib messages */
@@ -430,11 +429,7 @@ dpdk_hqos_thread_internal_hqos_dbg_bypass (vlib_main_t * vm)
          pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
                                                     (void **)
                                                     &pkts_enq[pkts_enq_len],
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
                                                     hqos->hqos_burst_enq, 0);
-#else
-                                                    hqos->hqos_burst_enq);
-#endif
 
          /* Get next SWQ for this device */
          swq_pos++;
@@ -525,11 +520,7 @@ dpdk_hqos_thread_internal (vlib_main_t * vm)
          pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
                                                     (void **)
                                                     &pkts_enq[pkts_enq_len],
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
                                                     hqos->hqos_burst_enq, 0);
-#else
-                                                    hqos->hqos_burst_enq);
-#endif
 
          /* Get next SWQ for this device */
          swq_pos++;