net/sfc: fence off 8 bits in Rx mark for tunnel offload

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

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 3b5b6bc..819f646 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -7,7 +7,8 @@
 
 #include <limits.h>
 #include <stdbool.h>
-#include "../virtio_pci.h"
+
+#include "../virtio.h"
 #include "../virtio_ring.h"
 
 enum virtio_user_backend_type {
@@ -24,18 +25,10 @@ struct virtio_user_queue {
 };
 
 struct virtio_user_dev {
+       struct virtio_hw hw;
        enum virtio_user_backend_type backend_type;
-       /* for vhost_user backend */
-       int             vhostfd;
-       int             listenfd;   /* listening fd */
        bool            is_server;  /* server or client mode */
 
-       /* for vhost_kernel backend */
-       char            *ifname;
-       int             *vhostfds;
-       int             *tapfds;
-
-       /* for both vhost_user and vhost_kernel */
        int             callfds[VIRTIO_MAX_VIRTQUEUES];
        int             kickfds[VIRTIO_MAX_VIRTQUEUES];
        int             mac_specified;
@@ -48,12 +41,12 @@ struct virtio_user_dev {
        uint64_t        device_features; /* supported features by device */
        uint64_t        frontend_features; /* enabled frontend features */
        uint64_t        unsupported_features; /* unsupported features mask */
-       uint64_t        protocol_features; /* negotiated protocol features */
        uint8_t         status;
        uint16_t        net_status;
-       uint16_t        port_id;
        uint8_t         mac_addr[RTE_ETHER_ADDR_LEN];
        char            path[PATH_MAX];
+       char            *ifname;
+
        union {
                struct vring            vrings[VIRTIO_MAX_VIRTQUEUES];
                struct vring_packed     packed_vrings[VIRTIO_MAX_VIRTQUEUES];
@@ -64,6 +57,8 @@ struct virtio_user_dev {
        struct virtio_user_backend_ops *ops;
        pthread_mutex_t mutex;
        bool            started;
+
+       void *backend_data;
 };
 
 int virtio_user_dev_set_features(struct virtio_user_dev *dev);
@@ -81,5 +76,10 @@ void virtio_user_handle_cq_packed(struct virtio_user_dev *dev,
 uint8_t virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs);
 int virtio_user_dev_set_status(struct virtio_user_dev *dev, uint8_t status);
 int virtio_user_dev_update_status(struct virtio_user_dev *dev);
+int virtio_user_dev_update_link_state(struct virtio_user_dev *dev);
+int virtio_user_dev_set_mac(struct virtio_user_dev *dev);
+int virtio_user_dev_get_mac(struct virtio_user_dev *dev);
+void virtio_user_dev_delayed_disconnect_handler(void *param);
+int virtio_user_dev_server_reconnect(struct virtio_user_dev *dev);
 extern const char * const virtio_user_backend_strings[];
 #endif