New upstream version 18.08

[deb_dpdk.git] / drivers / net / virtio / virtio_rxtx_simple.c

diff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c
index 5152075..31e565b 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple.c
+++ b/drivers/net/virtio/virtio_rxtx_simple.c
@@ -27,73 +27,6 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 
-uint16_t
-virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts,
-       uint16_t nb_pkts)
-{
-       struct virtnet_tx *txvq = tx_queue;
-       struct virtqueue *vq = txvq->vq;
-       struct virtio_hw *hw = vq->hw;
-       uint16_t nb_used;
-       uint16_t desc_idx;
-       struct vring_desc *start_dp;
-       uint16_t nb_tail, nb_commit;
-       int i;
-       uint16_t desc_idx_max = (vq->vq_nentries >> 1) - 1;
-       uint16_t nb_tx = 0;
-
-       if (unlikely(hw->started == 0 && tx_pkts != hw->inject_pkts))
-               return nb_tx;
-
-       nb_used = VIRTQUEUE_NUSED(vq);
-       rte_compiler_barrier();
-
-       if (nb_used >= VIRTIO_TX_FREE_THRESH)
-               virtio_xmit_cleanup_simple(vq);
-
-       nb_commit = nb_pkts = RTE_MIN((vq->vq_free_cnt >> 1), nb_pkts);
-       desc_idx = (uint16_t)(vq->vq_avail_idx & desc_idx_max);
-       start_dp = vq->vq_ring.desc;
-       nb_tail = (uint16_t) (desc_idx_max + 1 - desc_idx);
-
-       if (nb_commit >= nb_tail) {
-               for (i = 0; i < nb_tail; i++)
-                       vq->vq_descx[desc_idx + i].cookie = tx_pkts[i];
-               for (i = 0; i < nb_tail; i++) {
-                       start_dp[desc_idx].addr =
-                               VIRTIO_MBUF_DATA_DMA_ADDR(*tx_pkts, vq);
-                       start_dp[desc_idx].len = (*tx_pkts)->pkt_len;
-                       tx_pkts++;
-                       desc_idx++;
-               }
-               nb_commit -= nb_tail;
-               desc_idx = 0;
-       }
-       for (i = 0; i < nb_commit; i++)
-               vq->vq_descx[desc_idx + i].cookie = tx_pkts[i];
-       for (i = 0; i < nb_commit; i++) {
-               start_dp[desc_idx].addr =
-                       VIRTIO_MBUF_DATA_DMA_ADDR(*tx_pkts, vq);
-               start_dp[desc_idx].len = (*tx_pkts)->pkt_len;
-               tx_pkts++;
-               desc_idx++;
-       }
-
-       rte_compiler_barrier();
-
-       vq->vq_free_cnt -= (uint16_t)(nb_pkts << 1);
-       vq->vq_avail_idx += nb_pkts;
-       vq->vq_ring.avail->idx = vq->vq_avail_idx;
-       txvq->stats.packets += nb_pkts;
-
-       if (likely(nb_pkts)) {
-               if (unlikely(virtqueue_kick_prepare(vq)))
-                       virtqueue_notify(vq);
-       }
-
-       return nb_pkts;
-}
-
 int __attribute__((cold))
 virtio_rxq_vec_setup(struct virtnet_rx *rxq)
 {