raw/cnxk_bphy: keep leading zero in device name

[dpdk.git] / lib / eventdev / rte_event_eth_rx_adapter.c

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index e570f2f..a175c61 100644 (file)
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -905,14 +905,14 @@ rxa_buffer_mbufs(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id,
                ts = m->ol_flags & event_eth_rx_timestamp_dynflag ?
                                                0 : rte_get_tsc_cycles();
 
-               /* 0xffff ffff ffff ffff if PKT_RX_TIMESTAMP is set,
+               /* 0xffff ffff ffff ffff if RTE_MBUF_F_RX_TIMESTAMP is set,
                 * otherwise 0
                 */
                ts_mask = (uint64_t)(!(m->ol_flags &
                                       event_eth_rx_timestamp_dynflag)) - 1ULL;
 
-               /* 0xffff ffff if PKT_RX_RSS_HASH is set, otherwise 0 */
-               rss_mask = ~(((m->ol_flags & PKT_RX_RSS_HASH) != 0) - 1);
+               /* 0xffff ffff if RTE_MBUF_F_RX_RSS_HASH is set, otherwise 0 */
+               rss_mask = ~(((m->ol_flags & RTE_MBUF_F_RX_RSS_HASH) != 0) - 1);
                do_rss = !rss_mask && !eth_rx_queue_info->flow_id_mask;
                for (i = 0; i < num; i++) {
                        struct rte_event *ev;
@@ -2739,6 +2739,11 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, uint16_t eth_dev_id,
                rx_adapter->eth_rx_poll = rx_poll;
                rx_adapter->wrr_sched = rx_wrr;
                rx_adapter->wrr_len = nb_wrr;
+               /*
+                * reset next poll start position (wrr_pos) to avoid buffer
+                * overrun when wrr_len is reduced in case of queue delete
+                */
+               rx_adapter->wrr_pos = 0;
                rx_adapter->num_intr_vec += num_intr_vec;
 
                if (dev_info->nb_dev_queues == 0) {