Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MPLS Mcast
[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
3a695b1
..
b7a8db0
100644
(file)
--- a/
src/vnet/devices/ssvm/node.c
+++ b/
src/vnet/devices/ssvm/node.c
@@
-89,7
+89,7
@@
ssvm_eth_device_input (ssvm_eth_main_t * em,
ethernet_header_t *eh0;
u16 type0;
u32 n_rx_bytes = 0, l3_offset0;
ethernet_header_t *eh0;
u16 type0;
u32 n_rx_bytes = 0, l3_offset0;
- u32
cpu_index = os_get_cpu_number
();
+ u32
thread_index = vlib_get_thread_index
();
u32 trace_cnt __attribute__ ((unused)) = vlib_get_trace_count (vm, node);
volatile u32 *lock;
u32 *elt_indices;
u32 trace_cnt __attribute__ ((unused)) = vlib_get_trace_count (vm, node);
volatile u32 *lock;
u32 *elt_indices;
@@
-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 ||
@@
-284,9
+284,11
@@
out:
vlib_increment_combined_counter
(vnet_get_main ()->interface_main.combined_sw_if_counters
vlib_increment_combined_counter
(vnet_get_main ()->interface_main.combined_sw_if_counters
- + VNET_INTERFACE_COUNTER_RX,
cpu
_index,
+ + VNET_INTERFACE_COUNTER_RX,
thread
_index,
intfc->vlib_hw_if_index, rx_queue_index, n_rx_bytes);
intfc->vlib_hw_if_index, rx_queue_index, n_rx_bytes);
+ vnet_device_increment_rx_packets (thread_index, rx_queue_index);
+
return rx_queue_index;
}
return rx_queue_index;
}