X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fssvm%2Fnode.c;h=344b357662c04b63d0b8f84049105eccb3a15904;hb=149a1433b0e6301a34989f5e8c7ebed3fa5bf74e;hp=539b4161d7a9a2cf8f16f035e4c6d5a4a6e5ee04;hpb=586afd762bfa149f5ca167bd5fd5a0cd59ce94fe;p=vpp.git

diff --git a/src/vnet/devices/ssvm/node.c b/src/vnet/devices/ssvm/node.c
index 539b4161d7a..344b357662c 100644
--- a/src/vnet/devices/ssvm/node.c
+++ b/src/vnet/devices/ssvm/node.c
@@ -70,7 +70,7 @@ ssvm_eth_device_input (ssvm_eth_main_t * em,
 {
   ssvm_shared_header_t *sh = intfc->sh;
   vlib_main_t *vm = em->vlib_main;
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   ssvm_eth_queue_elt_t *elt, *elts;
   u32 elt_index;
   u32 my_pid = intfc->my_pid;
@@ -101,9 +101,9 @@ ssvm_eth_device_input (ssvm_eth_main_t * em,
     return 0;
 
   if (intfc->i_am_master)
-    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_MASTER_Q_INDEX]);
+    q = (svm_queue_t *) (sh->opaque[TO_MASTER_Q_INDEX]);
   else
-    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_SLAVE_Q_INDEX]);
+    q = (svm_queue_t *) (sh->opaque[TO_SLAVE_Q_INDEX]);
 
   /* Nothing to do? */
   if (q->cursize == 0)
@@ -118,7 +118,7 @@ ssvm_eth_device_input (ssvm_eth_main_t * em,
     ;
   while (q->cursize > 0)
     {
-      unix_shared_memory_queue_sub_raw (q, (u8 *) & elt_index);
+      svm_queue_sub_raw (q, (u8 *) & elt_index);
       ASSERT (elt_index < 2048);
       vec_add1 (intfc->rx_queue, elt_index);
     }
@@ -210,7 +210,7 @@ ssvm_eth_device_input (ssvm_eth_main_t * em,
 	    next0 = SSVM_ETH_INPUT_NEXT_IP4_INPUT;
 	  else if (type0 == ETHERNET_TYPE_IP6)
 	    next0 = SSVM_ETH_INPUT_NEXT_IP6_INPUT;
-	  else if (type0 == ETHERNET_TYPE_MPLS_UNICAST)
+	  else if (type0 == ETHERNET_TYPE_MPLS)
 	    next0 = SSVM_ETH_INPUT_NEXT_MPLS_INPUT;
 
 	  l3_offset0 = ((next0 == SSVM_ETH_INPUT_NEXT_IP4_INPUT ||