net: add rte prefix to ether defines

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

diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 58fdd3d..a38cb45 100644 (file)
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -113,6 +113,7 @@ struct virtnet_ctl;
 
 #define VIRTIO_F_VERSION_1             32
 #define VIRTIO_F_IOMMU_PLATFORM        33
+#define VIRTIO_F_RING_PACKED           34
 
 /*
  * Some VirtIO feature bits (currently bits 28 through 31) are
@@ -128,6 +129,12 @@ struct virtnet_ctl;
  */
 #define VIRTIO_F_IN_ORDER 35
 
+/*
+ * This feature indicates that memory accesses by the driver and the device
+ * are ordered in a way described by the platform.
+ */
+#define VIRTIO_F_ORDER_PLATFORM 36
+
 /* The Guest publishes the used index for which it expects an interrupt
  * at the end of the avail ring. Host should ignore the avail->flags field. */
 /* The Host publishes the avail index for which it expects a kick
@@ -204,7 +211,6 @@ struct virtio_pci_ops {
                             void *dst, int len);
        void (*write_dev_cfg)(struct virtio_hw *hw, size_t offset,
                              const void *src, int len);
-       void (*reset)(struct virtio_hw *hw);
 
        uint8_t (*get_status)(struct virtio_hw *hw);
        void    (*set_status)(struct virtio_hw *hw, uint8_t status);
@@ -232,7 +238,7 @@ struct virtio_hw {
        uint64_t    req_guest_features;
        uint64_t    guest_features;
        uint32_t    max_queue_pairs;
-       uint16_t    started;
+       bool        started;
        uint16_t        max_mtu;
        uint16_t    vtnet_hdr_size;
        uint8_t     vlan_strip;
@@ -241,10 +247,11 @@ struct virtio_hw {
        uint8_t     use_simple_rx;
        uint8_t     use_inorder_rx;
        uint8_t     use_inorder_tx;
+       uint8_t     weak_barriers;
        bool        has_tx_offload;
        bool        has_rx_offload;
        uint16_t    port_id;
-       uint8_t     mac_addr[ETHER_ADDR_LEN];
+       uint8_t     mac_addr[RTE_ETHER_ADDR_LEN];
        uint32_t    notify_off_multiplier;
        uint8_t     *isr;
        uint16_t    *notify_base;
@@ -258,6 +265,7 @@ struct virtio_hw {
         */
        rte_spinlock_t state_lock;
        struct rte_mbuf **inject_pkts;
+       bool        opened;
 
        struct virtqueue **vqs;
 };
@@ -286,7 +294,7 @@ extern struct virtio_hw_internal virtio_hw_internal[RTE_MAX_ETHPORTS];
  */
 struct virtio_net_config {
        /* The config defining mac address (if VIRTIO_NET_F_MAC) */
-       uint8_t    mac[ETHER_ADDR_LEN];
+       uint8_t    mac[RTE_ETHER_ADDR_LEN];
        /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
        uint16_t   status;
        uint16_t   max_virtqueue_pairs;
@@ -314,6 +322,12 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit)
        return (hw->guest_features & (1ULL << bit)) != 0;
 }
 
+static inline int
+vtpci_packed_queue(struct virtio_hw *hw)
+{
+       return vtpci_with_feature(hw, VIRTIO_F_RING_PACKED);
+}
+
 /*
  * Function declaration from virtio_pci.c
  */