replace packed attributes

[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 4c975a5..302d6c3 100644 (file)
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -129,6 +129,18 @@ 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
+
+/*
+ * This feature indicates that the driver passes extra data (besides
+ * identifying the virtqueue) in its device notifications.
+ */
+#define VIRTIO_F_NOTIFICATION_DATA 38
+
 /* 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
@@ -241,10 +253,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;
@@ -287,12 +300,12 @@ 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;
        uint16_t   mtu;
-} __attribute__((packed));
+} __rte_packed;
 
 /*
  * How many bits to shift physical queue address written to QUEUE_PFN.
@@ -315,6 +328,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
  */