fm10k: fix VLAN flag in scattered Rx

[dpdk.git] / drivers / net / fm10k / fm10k_rxtx_vec.c

diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c
index 06beca9..2a57eef 100644 (file)
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -44,8 +44,6 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 
-static void
-fm10k_tx_queue_release_mbufs_vec(struct fm10k_tx_queue *txq);
 static void
 fm10k_reset_tx_queue(struct fm10k_tx_queue *txq);
 
@@ -634,7 +632,6 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue,
 }
 
 static const struct fm10k_txq_ops vec_txq_ops = {
-       .release_mbufs = fm10k_tx_queue_release_mbufs_vec,
        .reset = fm10k_reset_tx_queue,
 };
 
@@ -644,6 +641,16 @@ fm10k_txq_vec_setup(struct fm10k_tx_queue *txq)
        txq->ops = &vec_txq_ops;
 }
 
+int __attribute__((cold))
+fm10k_tx_vec_condition_check(struct fm10k_tx_queue *txq)
+{
+       /* Vector TX can't offload any features yet */
+       if ((txq->txq_flags & FM10K_SIMPLE_TX_FLAG) != FM10K_SIMPLE_TX_FLAG)
+               return -1;
+
+       return 0;
+}
+
 static inline void
 vtx1(volatile struct fm10k_tx_desc *txdp,
                struct rte_mbuf *pkt, uint64_t flags)
@@ -794,31 +801,6 @@ fm10k_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
        return nb_pkts;
 }
 
-static void __attribute__((cold))
-fm10k_tx_queue_release_mbufs_vec(struct fm10k_tx_queue *txq)
-{
-       unsigned i;
-       const uint16_t max_desc = (uint16_t)(txq->nb_desc - 1);
-
-       if (txq->sw_ring == NULL || txq->nb_free == max_desc)
-               return;
-
-       /* release the used mbufs in sw_ring */
-       for (i = txq->next_dd - (txq->rs_thresh - 1);
-            i != txq->next_free;
-            i = (i + 1) & max_desc)
-               rte_pktmbuf_free_seg(txq->sw_ring[i]);
-
-       txq->nb_free = max_desc;
-
-       /* reset tx_entry */
-       for (i = 0; i < txq->nb_desc; i++)
-               txq->sw_ring[i] = NULL;
-
-       rte_free(txq->sw_ring);
-       txq->sw_ring = NULL;
-}
-
 static void __attribute__((cold))
 fm10k_reset_tx_queue(struct fm10k_tx_queue *txq)
 {