diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-04-23 14:20:17 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-04-24 08:23:10 +0100 |
| commit | 5076209fa6f4affdf93f4d2f23f51a427f64f72b (patch) | |
| tree | 2dd6d71d781670133d79938ba6a3c27163e82306 /drivers/net/virtio/virtqueue.h | |
| parent | 68f5e9d7d40c36c6ea398953af7e56519928ea78 (diff) | |
| parent | 18af4227fa5eee002b1a79207935620f6112803e (diff) | |
Merge branch 'upstream-16.11-stable' into 16.11.x
Change-Id: Ie0b10377bb151ddac6307982be5b15624206e6a6
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/virtio/virtqueue.h')
| -rw-r--r-- | drivers/net/virtio/virtqueue.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index ec967a5b..3748f606 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -288,10 +288,10 @@ void virtqueue_dump(struct virtqueue *vq); /** * Get all mbufs to be freed. */ -struct rte_mbuf *virtqueue_detatch_unused(struct virtqueue *vq); +struct rte_mbuf *virtqueue_detach_unused(struct virtqueue *vq); /* Flush the elements in the used ring. */ -void virtqueue_flush(struct virtqueue *vq); +void virtqueue_rxvq_flush(struct virtqueue *vq); static inline int virtqueue_full(const struct virtqueue *vq) @@ -299,6 +299,17 @@ virtqueue_full(const struct virtqueue *vq) return vq->vq_free_cnt == 0; } +static inline int +virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx) +{ + if (vtpci_queue_idx == hw->max_queue_pairs * 2) + return VTNET_CQ; + else if (vtpci_queue_idx % 2 == 0) + return VTNET_RQ; + else + return VTNET_TQ; +} + #define VIRTQUEUE_NUSED(vq) ((uint16_t)((vq)->vq_ring.used->idx - (vq)->vq_used_cons_idx)) void vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx); |