3 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/dev_ena/rx_node.c b/src/plugins/dev_ena/rx_node.c
index 41fc5b8c943..51c6dbce84c 100644
--- a/src/plugins/dev_ena/rx_node.c
+++ b/src/plugins/dev_ena/rx_node.c
@@ -251,7 +251,6 @@ ena_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
 			 vnet_dev_rx_queue_t *rxq)
 {
   ena_rxq_t *q = vnet_dev_get_rx_queue_data (rxq);
-  vnet_dev_port_t *port = rxq->port;
   vnet_main_t *vnm = vnet_get_main ();
   vlib_buffer_t *buffers[VLIB_FRAME_SIZE], **b;
   ena_rx_cdesc_status_t statuses[VLIB_FRAME_SIZE + 8];
@@ -260,13 +259,13 @@ ena_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
   u16 *csi;
   uword n_rx_packets = 0, n_rx_bytes = 0;
   vlib_frame_bitmap_t head_bmp = {};
-  u32 sw_if_index = port->intf.sw_if_index;
-  u32 hw_if_index = port->intf.hw_if_index;
+  u32 sw_if_index = vnet_dev_get_rx_queue_if_sw_if_index (rxq);
+  u32 hw_if_index = vnet_dev_get_rx_queue_if_hw_if_index (rxq);
   u32 n_trace, n_deq, n_left;
   u32 cq_next = q->cq_next;
-  u32 next_index = rxq->next_index;
+  u32 next_index = vnet_dev_get_rx_queue_if_next_index (rxq);
   vlib_frame_t *next_frame;
-  vlib_buffer_template_t bt = rxq->buffer_template;
+  vlib_buffer_template_t bt = vnet_dev_get_rx_queue_if_buffer_template (rxq);
   u32 *bi;
   int maybe_chained;
 
diff --git a/src/plugins/dev_iavf/port.c b/src/plugins/dev_iavf/port.c
index f1578fccb59..54f5f1d1515 100644
--- a/src/plugins/dev_iavf/port.c
+++ b/src/plugins/dev_iavf/port.c
@@ -263,7 +263,7 @@ avf_msix_n_handler (vlib_main_t *vm, vnet_dev_t *dev, u16 line)
 
   iavf_reg_write (ad, IAVF_VFINT_DYN_CTLN (line), dyn_ctln_enabled.as_u32);
   vlib_node_set_interrupt_pending (vlib_get_main_by_index (line),
-				   port->intf.rx_node_index);
+				   vnet_dev_get_port_rx_node_idex (port));
 }
 
 vnet_dev_rv_t
diff --git a/src/plugins/dev_iavf/rx_node.c b/src/plugins/dev_iavf/rx_node.c
index ee6d7e8def0..bf650f9bfb9 100644
--- a/src/plugins/dev_iavf/rx_node.c
+++ b/src/plugins/dev_iavf/rx_node.c
@@ -249,14 +249,14 @@ iavf_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
   u32 thr_idx = vlib_get_thread_index ();
   iavf_rt_data_t *rtd = vnet_dev_get_rt_temp_space (vm);
   iavf_rxq_t *arq = vnet_dev_get_rx_queue_data (rxq);
-  vlib_buffer_template_t bt = rxq->buffer_template;
+  vlib_buffer_template_t bt = vnet_dev_get_rx_queue_if_buffer_template (rxq);
   u32 n_trace, n_rx_packets = 0, n_rx_bytes = 0;
   u16 n_tail_desc = 0;
   u64 or_qw1 = 0;
   u32 *bi, *to_next, n_left_to_next;
-  u32 next_index = rxq->next_index;
-  u32 sw_if_index = port->intf.sw_if_index;
-  u32 hw_if_index = port->intf.hw_if_index;
+  u32 next_index = vnet_dev_get_rx_queue_if_next_index (rxq);
+  u32 sw_if_index = vnet_dev_get_rx_queue_if_sw_if_index (rxq);
+  u32 hw_if_index = vnet_dev_get_rx_queue_if_hw_if_index (rxq);
   u16 next = arq->next;
   u16 size = rxq->size;
   u16 mask = size - 1;