net/sfc: do not use Rx queue control state on datapath

[dpdk.git] / drivers / net / sfc / sfc_rx.c

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index 214e640..6af1574 100644 (file)
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -194,7 +194,7 @@ sfc_rx_set_rss_hash(struct sfc_rxq *rxq, unsigned int flags, struct rte_mbuf *m)
        uint8_t *mbuf_data;
 
 
-       if ((rxq->flags & SFC_RXQ_RSS_HASH) == 0)
+       if ((rxq->flags & SFC_RXQ_FLAG_RSS_HASH) == 0)
                return;
 
        mbuf_data = rte_pktmbuf_mtod(m, uint8_t *);
@@ -219,7 +219,7 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        boolean_t discard_next = B_FALSE;
        struct rte_mbuf *scatter_pkt = NULL;
 
-       if (unlikely((rxq->state & SFC_RXQ_RUNNING) == 0))
+       if (unlikely((rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0))
                return 0;
 
        sfc_ev_qpoll(rxq->evq);
@@ -320,7 +320,7 @@ sfc_rx_qdesc_npending(struct sfc_adapter *sa, unsigned int sw_index)
        SFC_ASSERT(sw_index < sa->rxq_count);
        rxq = sa->rxq_info[sw_index].rxq;
 
-       if (rxq == NULL || (rxq->state & SFC_RXQ_RUNNING) == 0)
+       if (rxq == NULL || (rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0)
                return 0;
 
        sfc_ev_qpoll(rxq->evq);
@@ -331,7 +331,7 @@ sfc_rx_qdesc_npending(struct sfc_adapter *sa, unsigned int sw_index)
 int
 sfc_rx_qdesc_done(struct sfc_rxq *rxq, unsigned int offset)
 {
-       if ((rxq->state & SFC_RXQ_RUNNING) == 0)
+       if ((rxq->flags & SFC_RXQ_FLAG_RUNNING) == 0)
                return 0;
 
        sfc_ev_qpoll(rxq->evq);
@@ -486,7 +486,8 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
        rxq->pending = rxq->completed = rxq->added = rxq->pushed = 0;
 
-       rxq->state |= (SFC_RXQ_STARTED | SFC_RXQ_RUNNING);
+       rxq->state |= SFC_RXQ_STARTED;
+       rxq->flags |= SFC_RXQ_FLAG_STARTED | SFC_RXQ_FLAG_RUNNING;
 
        sfc_rx_qrefill(rxq);
 
@@ -533,13 +534,14 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index)
        sa->eth_dev->data->rx_queue_state[sw_index] =
                RTE_ETH_QUEUE_STATE_STOPPED;
 
-       rxq->state &= ~SFC_RXQ_RUNNING;
+       rxq->flags &= ~SFC_RXQ_FLAG_RUNNING;
 
        if (sw_index == 0)
                efx_mac_filter_default_rxq_clear(sa->nic);
 
        sfc_rx_qflush(sa, sw_index);
 
+       rxq->flags &= ~SFC_RXQ_FLAG_STARTED;
        rxq->state = SFC_RXQ_INITIALIZED;
 
        efx_rx_qdestroy(rxq->common);
@@ -765,7 +767,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 
 #if EFSYS_OPT_RX_SCALE
        if (sa->hash_support == EFX_RX_HASH_AVAILABLE)
-               rxq->flags |= SFC_RXQ_RSS_HASH;
+               rxq->flags |= SFC_RXQ_FLAG_RSS_HASH;
 #endif
 
        rxq->state = SFC_RXQ_INITIALIZED;