memif: fix max number of rings

Change-Id: Ie7621a38a44e7c692e23e58c43d27d8d2aab43e6
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/extras/libmemif/src/socket.c b/extras/libmemif/src/socket.c
index fd40056..3982c96 100644 (file)
--- a/extras/libmemif/src/socket.c
+++ b/extras/libmemif/src/socket.c
@@ -107,7 +107,7 @@ memif_msg_send_hello (int fd)
   msg.type = MEMIF_MSG_TYPE_HELLO;
   h->min_version = MEMIF_VERSION;
   h->max_version = MEMIF_VERSION;
-  h->max_s2m_ring = MEMIF_MAX_M2S_RING;
+  h->max_s2m_ring = MEMIF_MAX_S2M_RING;
   h->max_m2s_ring = MEMIF_MAX_M2S_RING;
   h->max_region = MEMIF_MAX_REGION;
   h->max_log2_ring_size = MEMIF_MAX_LOG2_RING_SIZE;

diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h
index c7fec67..82056a1 100644 (file)
--- a/src/plugins/memif/private.h
+++ b/src/plugins/memif/private.h
@@ -24,9 +24,9 @@
 #define MEMIF_DEFAULT_TX_QUEUES 1
 #define MEMIF_DEFAULT_BUFFER_SIZE 2048
 
-#define MEMIF_MAX_M2S_RING             (vec_len (vlib_mains) - 1)
-#define MEMIF_MAX_S2M_RING             (vec_len (vlib_mains) - 1)
-#define MEMIF_MAX_REGION               255
+#define MEMIF_MAX_M2S_RING             (vec_len (vlib_mains))
+#define MEMIF_MAX_S2M_RING             256
+#define MEMIF_MAX_REGION               256
 #define MEMIF_MAX_LOG2_RING_SIZE       14
 
 

diff --git a/src/plugins/memif/socket.c b/src/plugins/memif/socket.c
index cefbb86..82e865d 100644 (file)
--- a/src/plugins/memif/socket.c
+++ b/src/plugins/memif/socket.c
@@ -87,7 +87,7 @@ memif_msg_enq_hello (clib_socket_t * sock)
   h->min_version = MEMIF_VERSION;
   h->max_version = MEMIF_VERSION;
   h->max_m2s_ring = MEMIF_MAX_M2S_RING;
-  h->max_s2m_ring = MEMIF_MAX_M2S_RING;
+  h->max_s2m_ring = MEMIF_MAX_S2M_RING;
   h->max_region = MEMIF_MAX_REGION;
   h->max_log2_ring_size = MEMIF_MAX_LOG2_RING_SIZE;
   s = format (0, "VPP %s%c", VPP_BUILD_VER, 0);