X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fmessage_queue.c;h=a40c4a46a390ba2a51f058dec2edd8964d80e6ef;hb=2b5fed8696ce2a9b67e63cf5b5dbf49505172c9a;hp=630442064f8e9f091773fc87630dc6cfe7df7222;hpb=1a3d2370b53bcdb13581d8be0d9410974b9966c3;p=vpp.git

diff --git a/src/svm/message_queue.c b/src/svm/message_queue.c
index 630442064f8..a40c4a46a39 100644
--- a/src/svm/message_queue.c
+++ b/src/svm/message_queue.c
@@ -120,7 +120,8 @@ svm_msg_q_lock_and_alloc_msg_w_ring (svm_msg_q_t * mq, u32 ring_index,
     {
       if (svm_msg_q_try_lock (mq))
 	return -1;
-      if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, ring_index)))
+      if (PREDICT_FALSE (svm_msg_q_is_full (mq)
+			 || svm_msg_q_ring_is_full (mq, ring_index)))
 	{
 	  svm_msg_q_unlock (mq);
 	  return -2;
@@ -135,7 +136,8 @@ svm_msg_q_lock_and_alloc_msg_w_ring (svm_msg_q_t * mq, u32 ring_index,
   else
     {
       svm_msg_q_lock (mq);
-      while (svm_msg_q_ring_is_full (mq, ring_index))
+      while (svm_msg_q_is_full (mq)
+	     || svm_msg_q_ring_is_full (mq, ring_index))
 	svm_msg_q_wait (mq);
       *msg = svm_msg_q_alloc_msg_w_ring (mq, ring_index);
     }