net: add rte prefix to ether defines

[dpdk.git] / drivers / net / virtio / virtio_user / virtio_user_dev.c

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index d115737..e743695 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <rte_string_fns.h>
 #include <rte_eal_memconfig.h>
 
 #include "vhost.h"
@@ -52,11 +53,11 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
 
        if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) {
                addr.desc_user_addr =
-                       (uint64_t)(uintptr_t)pq_vring->desc_packed;
+                       (uint64_t)(uintptr_t)pq_vring->desc;
                addr.avail_user_addr =
-                       (uint64_t)(uintptr_t)pq_vring->driver_event;
+                       (uint64_t)(uintptr_t)pq_vring->driver;
                addr.used_user_addr =
-                       (uint64_t)(uintptr_t)pq_vring->device_event;
+                       (uint64_t)(uintptr_t)pq_vring->device;
        } else {
                addr.desc_user_addr = (uint64_t)(uintptr_t)vring->desc;
                addr.avail_user_addr = (uint64_t)(uintptr_t)vring->avail;
@@ -225,15 +226,15 @@ static inline void
 parse_mac(struct virtio_user_dev *dev, const char *mac)
 {
        int i, r;
-       uint32_t tmp[ETHER_ADDR_LEN];
+       uint32_t tmp[RTE_ETHER_ADDR_LEN];
 
        if (!mac)
                return;
 
        r = sscanf(mac, "%x:%x:%x:%x:%x:%x", &tmp[0],
                        &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]);
-       if (r == ETHER_ADDR_LEN) {
-               for (i = 0; i < ETHER_ADDR_LEN; ++i)
+       if (r == RTE_ETHER_ADDR_LEN) {
+               for (i = 0; i < RTE_ETHER_ADDR_LEN; ++i)
                        dev->mac_addr[i] = (uint8_t)tmp[i];
                dev->mac_specified = 1;
        } else {
@@ -426,14 +427,15 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
 int
 virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
                     int cq, int queue_size, const char *mac, char **ifname,
-                    int mrg_rxbuf, int in_order, int packed_vq)
+                    int server, int mrg_rxbuf, int in_order, int packed_vq)
 {
        pthread_mutex_init(&dev->mutex, NULL);
-       snprintf(dev->path, PATH_MAX, "%s", path);
+       strlcpy(dev->path, path, PATH_MAX);
        dev->started = 0;
        dev->max_queue_pairs = queues;
        dev->queue_pairs = 1; /* mq disabled by default */
        dev->queue_size = queue_size;
+       dev->is_server = server;
        dev->mac_specified = 0;
        dev->frontend_features = 0;
        dev->unsupported_features = ~VIRTIO_USER_SUPPORTED_FEATURES;
@@ -627,8 +629,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
 static inline int
 desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)
 {
-       return wrap_counter == !!(desc->flags & VRING_DESC_F_AVAIL(1)) &&
-               wrap_counter != !!(desc->flags & VRING_DESC_F_USED(1));
+       uint16_t flags = desc->flags;
+
+       return wrap_counter == !!(flags & VRING_PACKED_DESC_F_AVAIL) &&
+               wrap_counter != !!(flags & VRING_PACKED_DESC_F_USED);
 }
 
 static uint32_t
@@ -650,30 +654,30 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
        n_descs++;
 
        idx_status = idx_data;
-       while (vring->desc_packed[idx_status].flags & VRING_DESC_F_NEXT) {
+       while (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) {
                idx_status++;
                if (idx_status >= dev->queue_size)
                        idx_status -= dev->queue_size;
                n_descs++;
        }
 
-       hdr = (void *)(uintptr_t)vring->desc_packed[idx_hdr].addr;
+       hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
        if (hdr->class == VIRTIO_NET_CTRL_MQ &&
            hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
                uint16_t queues;
 
                queues = *(uint16_t *)(uintptr_t)
-                               vring->desc_packed[idx_data].addr;
+                               vring->desc[idx_data].addr;
                status = virtio_user_handle_mq(dev, queues);
        }
 
        /* Update status */
        *(virtio_net_ctrl_ack *)(uintptr_t)
-               vring->desc_packed[idx_status].addr = status;
+               vring->desc[idx_status].addr = status;
 
        /* Update used descriptor */
-       vring->desc_packed[idx_hdr].id = vring->desc_packed[idx_status].id;
-       vring->desc_packed[idx_hdr].len = sizeof(status);
+       vring->desc[idx_hdr].id = vring->desc[idx_status].id;
+       vring->desc[idx_hdr].len = sizeof(status);
 
        return n_descs;
 }
@@ -683,19 +687,20 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *dev, uint16_t queue_idx)
 {
        struct virtio_user_queue *vq = &dev->packed_queues[queue_idx];
        struct vring_packed *vring = &dev->packed_vrings[queue_idx];
-       uint16_t n_descs;
+       uint16_t n_descs, flags;
 
-       while (desc_is_avail(&vring->desc_packed[vq->used_idx],
+       while (desc_is_avail(&vring->desc[vq->used_idx],
                             vq->used_wrap_counter)) {
 
                n_descs = virtio_user_handle_ctrl_msg_packed(dev, vring,
                                vq->used_idx);
 
+               flags = VRING_DESC_F_WRITE;
+               if (vq->used_wrap_counter)
+                       flags |= VRING_PACKED_DESC_F_AVAIL_USED;
+
                rte_smp_wmb();
-               vring->desc_packed[vq->used_idx].flags =
-                       VRING_DESC_F_WRITE |
-                       VRING_DESC_F_AVAIL(vq->used_wrap_counter) |
-                       VRING_DESC_F_USED(vq->used_wrap_counter);
+               vring->desc[vq->used_idx].flags = flags;
 
                vq->used_idx += n_descs;
                if (vq->used_idx >= dev->queue_size) {