drivers/net: use internal function to get ethdev struct

[dpdk.git] / drivers / net / memif / memif_socket.h

diff --git a/drivers/net/memif/memif_socket.h b/drivers/net/memif/memif_socket.h
index 9f40f8d..b0decbb 100644 (file)
--- a/drivers/net/memif/memif_socket.h
+++ b/drivers/net/memif/memif_socket.h
@@ -6,6 +6,7 @@
 #define _MEMIF_SOCKET_H_
 
 #include <sys/queue.h>
+#include <sys/un.h>
 
 /**
  * Remove device from socket device list. If no device is left on the socket,
@@ -59,7 +60,8 @@ void memif_disconnect(struct rte_eth_dev *dev);
  *   - On success, zero.
  *   - On failure, a negative value.
  */
-int memif_connect_master(struct rte_eth_dev *dev);
+int memif_connect_server(struct rte_eth_dev *dev);
+
 
 /**
  * If device is properly configured, send connection request.
@@ -70,7 +72,7 @@ int memif_connect_master(struct rte_eth_dev *dev);
  *   - On success, zero.
  *   - On failure, a negative value.
  */
-int memif_connect_slave(struct rte_eth_dev *dev);
+int memif_connect_client(struct rte_eth_dev *dev);
 
 struct memif_socket_dev_list_elt {
        TAILQ_ENTRY(memif_socket_dev_list_elt) next;
@@ -79,11 +81,12 @@ struct memif_socket_dev_list_elt {
 };
 
 #define MEMIF_SOCKET_HASH_NAME                 "memif-sh"
-#define MEMIF_SOCKET_KEY_LEN           256
+#define MEMIF_SOCKET_UN_SIZE   \
+       (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path))
 
 struct memif_socket {
-       struct rte_intr_handle intr_handle;     /**< interrupt handle */
-       char filename[MEMIF_SOCKET_KEY_LEN];    /**< socket filename */
+       struct rte_intr_handle *intr_handle;    /**< interrupt handle */
+       char filename[MEMIF_SOCKET_UN_SIZE];    /**< socket filename */
 
        TAILQ_HEAD(, memif_socket_dev_list_elt) dev_queue;
        /**< Queue of devices using this socket */
@@ -98,7 +101,7 @@ struct memif_msg_queue_elt {
 };
 
 struct memif_control_channel {
-       struct rte_intr_handle intr_handle;     /**< interrupt handle */
+       struct rte_intr_handle *intr_handle;    /**< interrupt handle */
        TAILQ_HEAD(, memif_msg_queue_elt) msg_queue; /**< control message queue */
        struct memif_socket *socket;            /**< pointer to socket */
        struct rte_eth_dev *dev;                /**< pointer to device */