Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix udp_ping api naming error
[vpp.git]
/
src
/
vnet
/
devices
/
ssvm
/
node.c
diff --git
a/src/vnet/devices/ssvm/node.c
b/src/vnet/devices/ssvm/node.c
index
539b416
..
344b357
100644
(file)
--- 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;
{
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;
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)
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
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)
/* Nothing to do? */
if (q->cursize == 0)
@@
-118,7
+118,7
@@
ssvm_eth_device_input (ssvm_eth_main_t * em,
;
while (q->cursize > 0)
{
;
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);
}
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;
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 ||
next0 = SSVM_ETH_INPUT_NEXT_MPLS_INPUT;
l3_offset0 = ((next0 == SSVM_ETH_INPUT_NEXT_IP4_INPUT ||