net/ice/base: update version

[dpdk.git] / drivers / net / virtio / virtio_ring.h

diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h
index 1760823..7ba3466 100644 (file)
--- a/drivers/net/virtio/virtio_ring.h
+++ b/drivers/net/virtio/virtio_ring.h
@@ -15,10 +15,15 @@
 #define VRING_DESC_F_WRITE      2
 /* This means the buffer contains a list of buffer descriptors. */
 #define VRING_DESC_F_INDIRECT   4
+
 /* This flag means the descriptor was made available by the driver */
-#define VRING_DESC_F_AVAIL(b)   ((uint16_t)(b) << 7)
+#define VRING_PACKED_DESC_F_AVAIL      (1 << 7)
 /* This flag means the descriptor was used by the device */
-#define VRING_DESC_F_USED(b)    ((uint16_t)(b) << 15)
+#define VRING_PACKED_DESC_F_USED       (1 << 15)
+
+/* Frequently used combinations */
+#define VRING_PACKED_DESC_F_AVAIL_USED (VRING_PACKED_DESC_F_AVAIL | \
+                                        VRING_PACKED_DESC_F_USED)
 
 /* The Host uses this in used->flags to advise the Guest: don't kick me
  * when you add a buffer.  It's unreliable, so it's simply an
@@ -78,10 +83,9 @@ struct vring_packed_desc_event {
 
 struct vring_packed {
        unsigned int num;
-       struct vring_packed_desc *desc_packed;
-       struct vring_packed_desc_event *driver_event;
-       struct vring_packed_desc_event *device_event;
-
+       struct vring_packed_desc *desc;
+       struct vring_packed_desc_event *driver;
+       struct vring_packed_desc_event *device;
 };
 
 struct vring {
@@ -161,11 +165,11 @@ vring_init_packed(struct vring_packed *vr, uint8_t *p, unsigned long align,
                 unsigned int num)
 {
        vr->num = num;
-       vr->desc_packed = (struct vring_packed_desc *)p;
-       vr->driver_event = (struct vring_packed_desc_event *)(p +
+       vr->desc = (struct vring_packed_desc *)p;
+       vr->driver = (struct vring_packed_desc_event *)(p +
                        vr->num * sizeof(struct vring_packed_desc));
-       vr->device_event = (struct vring_packed_desc_event *)
-               RTE_ALIGN_CEIL((uintptr_t)(vr->driver_event +
+       vr->device = (struct vring_packed_desc_event *)
+               RTE_ALIGN_CEIL(((uintptr_t)vr->driver +
                                sizeof(struct vring_packed_desc_event)), align);
 }