net/memif: replace master/slave arguments

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

diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 7a26e30..c526f90 100644 (file)
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -143,8 +143,8 @@ memif_msg_enq_hello(struct memif_control_channel *cc)
        e->msg.type = MEMIF_MSG_TYPE_HELLO;
        h->min_version = MEMIF_VERSION;
        h->max_version = MEMIF_VERSION;
-       h->max_s2m_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
-       h->max_m2s_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
+       h->max_c2s_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
+       h->max_s2c_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
        h->max_region = ETH_MEMIF_MAX_REGION_NUM - 1;
        h->max_log2_ring_size = ETH_MEMIF_MAX_LOG2_RING_SIZE;
 
@@ -165,10 +165,10 @@ memif_msg_receive_hello(struct rte_eth_dev *dev, memif_msg_t *msg)
        }
 
        /* Set parameters for active connection */
-       pmd->run.num_s2m_rings = RTE_MIN(h->max_s2m_ring + 1,
-                                          pmd->cfg.num_s2m_rings);
-       pmd->run.num_m2s_rings = RTE_MIN(h->max_m2s_ring + 1,
-                                          pmd->cfg.num_m2s_rings);
+       pmd->run.num_c2s_rings = RTE_MIN(h->max_c2s_ring + 1,
+                                          pmd->cfg.num_c2s_rings);
+       pmd->run.num_s2c_rings = RTE_MIN(h->max_s2c_ring + 1,
+                                          pmd->cfg.num_s2c_rings);
        pmd->run.log2_ring_size = RTE_MIN(h->max_log2_ring_size,
                                            pmd->cfg.log2_ring_size);
        pmd->run.pkt_buffer_size = pmd->cfg.pkt_buffer_size;
@@ -203,7 +203,7 @@ memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg)
                dev = elt->dev;
                pmd = dev->data->dev_private;
                if (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) &&
-                   (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_MASTER)) {
+                   (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_SERVER)) {
                        if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING |
                                           ETH_MEMIF_FLAG_CONNECTED)) {
                                memif_msg_enq_disconnect(cc,
@@ -300,21 +300,21 @@ memif_msg_receive_add_ring(struct rte_eth_dev *dev, memif_msg_t *msg, int fd)
        }
 
        /* check if we have enough queues */
-       if (ar->flags & MEMIF_MSG_ADD_RING_FLAG_S2M) {
-               if (ar->index >= pmd->cfg.num_s2m_rings) {
+       if (ar->flags & MEMIF_MSG_ADD_RING_FLAG_C2S) {
+               if (ar->index >= pmd->cfg.num_c2s_rings) {
                        memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
                        return -1;
                }
-               pmd->run.num_s2m_rings++;
+               pmd->run.num_c2s_rings++;
        } else {
-               if (ar->index >= pmd->cfg.num_m2s_rings) {
+               if (ar->index >= pmd->cfg.num_s2c_rings) {
                        memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
                        return -1;
                }
-               pmd->run.num_m2s_rings++;
+               pmd->run.num_s2c_rings++;
        }
 
-       mq = (ar->flags & MEMIF_MSG_ADD_RING_FLAG_S2M) ?
+       mq = (ar->flags & MEMIF_MSG_ADD_RING_FLAG_C2S) ?
            dev->data->rx_queues[ar->index] : dev->data->tx_queues[ar->index];
 
        mq->intr_handle.fd = fd;
@@ -449,7 +449,7 @@ memif_msg_enq_add_ring(struct rte_eth_dev *dev, uint8_t idx,
                return -1;
 
        ar = &e->msg.add_ring;
-       mq = (type == MEMIF_RING_S2M) ? dev->data->tx_queues[idx] :
+       mq = (type == MEMIF_RING_C2S) ? dev->data->tx_queues[idx] :
            dev->data->rx_queues[idx];
 
        e->msg.type = MEMIF_MSG_TYPE_ADD_RING;
@@ -458,7 +458,7 @@ memif_msg_enq_add_ring(struct rte_eth_dev *dev, uint8_t idx,
        ar->offset = mq->ring_offset;
        ar->region = mq->region;
        ar->log2_ring_size = mq->log2_ring_size;
-       ar->flags = (type == MEMIF_RING_S2M) ? MEMIF_MSG_ADD_RING_FLAG_S2M : 0;
+       ar->flags = (type == MEMIF_RING_C2S) ? MEMIF_MSG_ADD_RING_FLAG_C2S : 0;
        ar->private_hdr_size = 0;
 
        return 0;
@@ -575,8 +575,8 @@ memif_disconnect(struct rte_eth_dev *dev)
        rte_spinlock_unlock(&pmd->cc_lock);
 
        /* unconfig interrupts */
-       for (i = 0; i < pmd->cfg.num_s2m_rings; i++) {
-               if (pmd->role == MEMIF_ROLE_SLAVE) {
+       for (i = 0; i < pmd->cfg.num_c2s_rings; i++) {
+               if (pmd->role == MEMIF_ROLE_CLIENT) {
                        if (dev->data->tx_queues != NULL)
                                mq = dev->data->tx_queues[i];
                        else
@@ -592,8 +592,8 @@ memif_disconnect(struct rte_eth_dev *dev)
                        mq->intr_handle.fd = -1;
                }
        }
-       for (i = 0; i < pmd->cfg.num_m2s_rings; i++) {
-               if (pmd->role == MEMIF_ROLE_MASTER) {
+       for (i = 0; i < pmd->cfg.num_s2c_rings; i++) {
+               if (pmd->role == MEMIF_ROLE_SERVER) {
                        if (dev->data->tx_queues != NULL)
                                mq = dev->data->tx_queues[i];
                        else
@@ -616,7 +616,7 @@ memif_disconnect(struct rte_eth_dev *dev)
        memset(&pmd->run, 0, sizeof(pmd->run));
 
        MIF_LOG(DEBUG, "Disconnected, id: %d, role: %s.", pmd->id,
-               (pmd->role == MEMIF_ROLE_MASTER) ? "master" : "slave");
+               (pmd->role == MEMIF_ROLE_SERVER) ? "server" : "client");
 }
 
 static int
@@ -694,15 +694,15 @@ memif_msg_receive(struct memif_control_channel *cc)
                        if (ret < 0)
                                goto exit;
                }
-               for (i = 0; i < pmd->run.num_s2m_rings; i++) {
+               for (i = 0; i < pmd->run.num_c2s_rings; i++) {
                        ret = memif_msg_enq_add_ring(cc->dev, i,
-                                                    MEMIF_RING_S2M);
+                                                    MEMIF_RING_C2S);
                        if (ret < 0)
                                goto exit;
                }
-               for (i = 0; i < pmd->run.num_m2s_rings; i++) {
+               for (i = 0; i < pmd->run.num_s2c_rings; i++) {
                        ret = memif_msg_enq_add_ring(cc->dev, i,
-                                                    MEMIF_RING_M2S);
+                                                    MEMIF_RING_S2C);
                        if (ret < 0)
                                goto exit;
                }
@@ -969,7 +969,7 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)
        ret = rte_hash_lookup_data(hash, key, (void **)&socket);
        if (ret < 0) {
                socket = memif_socket_create(key,
-                       (pmd->role == MEMIF_ROLE_SLAVE) ? 0 : 1,
+                       (pmd->role == MEMIF_ROLE_CLIENT) ? 0 : 1,
                        pmd->flags & ETH_MEMIF_FLAG_SOCKET_ABSTRACT);
                if (socket == NULL)
                        return -1;
@@ -1046,7 +1046,7 @@ memif_socket_remove_device(struct rte_eth_dev *dev)
 }
 
 int
-memif_connect_master(struct rte_eth_dev *dev)
+memif_connect_server(struct rte_eth_dev *dev)
 {
        struct pmd_internals *pmd = dev->data->dev_private;
 
@@ -1057,7 +1057,7 @@ memif_connect_master(struct rte_eth_dev *dev)
 }
 
 int
-memif_connect_slave(struct rte_eth_dev *dev)
+memif_connect_client(struct rte_eth_dev *dev)
 {
        int sockfd;
        int ret;