net/cxgbe: fix port ID in Rx mbuf

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

diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c
index 9aaabd3..7be224c 100644 (file)
--- a/drivers/net/sfc/sfc_ef10_rx.c
+++ b/drivers/net/sfc/sfc_ef10_rx.c
@@ -171,8 +171,7 @@ sfc_ef10_rx_qrefill(struct sfc_ef10_rxq *rxq)
 
        SFC_ASSERT(rxq->added != added);
        rxq->added = added;
-       sfc_ef10_rx_qpush(rxq->doorbell, added, ptr_mask,
-                         &rxq->dp.dpq.rx_dbells);
+       sfc_ef10_rx_qpush(rxq->doorbell, added, ptr_mask, &rxq->dp.dpq.dbells);
 }
 
 static void
@@ -330,7 +329,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,
        /* Mask RSS hash offload flag if RSS is not enabled */
        sfc_ef10_rx_ev_to_offloads(rx_ev, m,
                                   (rxq->flags & SFC_EF10_RXQ_RSS_HASH) ?
-                                  ~0ull : ~PKT_RX_RSS_HASH);
+                                  ~0ull : ~RTE_MBUF_F_RX_RSS_HASH);
 
        /* data_off already moved past pseudo header */
        pseudo_hdr = (uint8_t *)m->buf_addr + RTE_PKTMBUF_HEADROOM;
@@ -338,7 +337,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,
        /*
         * Always get RSS hash from pseudo header to avoid
         * condition/branching. If it is valid or not depends on
-        * PKT_RX_RSS_HASH in m->ol_flags.
+        * RTE_MBUF_F_RX_RSS_HASH in m->ol_flags.
         */
        m->hash.rss = sfc_ef10_rx_pseudo_hdr_get_hash(pseudo_hdr);
 
@@ -392,7 +391,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,
                /*
                 * Always get RSS hash from pseudo header to avoid
                 * condition/branching. If it is valid or not depends on
-                * PKT_RX_RSS_HASH in m->ol_flags.
+                * RTE_MBUF_F_RX_RSS_HASH in m->ol_flags.
                 */
                m->hash.rss = sfc_ef10_rx_pseudo_hdr_get_hash(pseudo_hdr);
 
@@ -652,6 +651,10 @@ sfc_ef10_rx_qcreate(uint16_t port_id, uint16_t queue_id,
        if (info->rxq_entries != info->evq_entries)
                goto fail_rxq_args;
 
+       rc = ENOTSUP;
+       if (info->nic_dma_info->nb_regions > 0)
+               goto fail_nic_dma;
+
        rc = ENOMEM;
        rxq = rte_zmalloc_socket("sfc-ef10-rxq", sizeof(*rxq),
                                 RTE_CACHE_LINE_SIZE, socket_id);
@@ -697,6 +700,7 @@ fail_desc_alloc:
        rte_free(rxq);
 
 fail_rxq_alloc:
+fail_nic_dma:
 fail_rxq_args:
        return rc;
 }