Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0385458a56 | ||
|
895a0a1fed | ||
|
48797d204f | ||
|
0e0384cde9 | ||
|
9298a7ec0c | ||
|
c1931b2f09 | ||
|
fd9d936b3c |
@ -2,3 +2,4 @@
|
||||
host=gerrit.fd.io
|
||||
port=29418
|
||||
project=vpp
|
||||
defaultbranch=stable/2110
|
||||
|
483
RELEASE.md
483
RELEASE.md
File diff suppressed because it is too large
Load Diff
@ -3342,7 +3342,7 @@ nat44_ed_add_del_interface_address_cb (ip4_main_t *im, uword opaque,
|
||||
{
|
||||
rv = nat44_ed_add_static_mapping (
|
||||
rp->l_addr, address[0], rp->l_port, rp->e_port, rp->proto,
|
||||
rp->vrf_id, ~0, rp->flags, rp->pool_addr, rp->tag);
|
||||
rp->vrf_id, sw_if_index, rp->flags, rp->pool_addr, rp->tag);
|
||||
if (rv)
|
||||
{
|
||||
nat_elog_notice_X1 (sm, "add_static_mapping returned %d",
|
||||
|
@ -167,16 +167,19 @@ vcl_worker_alloc_and_init ()
|
||||
if (vcl_get_worker_index () != ~0)
|
||||
return 0;
|
||||
|
||||
/* Grab lock before selecting mem thread index */
|
||||
clib_spinlock_lock (&vcm->workers_lock);
|
||||
|
||||
/* Use separate heap map entry for worker */
|
||||
clib_mem_set_thread_index ();
|
||||
|
||||
if (pool_elts (vcm->workers) == vcm->cfg.max_workers)
|
||||
{
|
||||
VDBG (0, "max-workers %u limit reached", vcm->cfg.max_workers);
|
||||
return 0;
|
||||
wrk = 0;
|
||||
goto done;
|
||||
}
|
||||
|
||||
clib_spinlock_lock (&vcm->workers_lock);
|
||||
wrk = vcl_worker_alloc ();
|
||||
vcl_set_worker_index (wrk->wrk_index);
|
||||
wrk->thread_id = pthread_self ();
|
||||
@ -203,9 +206,9 @@ vcl_worker_alloc_and_init ()
|
||||
vec_reset_length (wrk->mq_msg_vector);
|
||||
vec_validate (wrk->unhandled_evts_vector, 128);
|
||||
vec_reset_length (wrk->unhandled_evts_vector);
|
||||
clib_spinlock_unlock (&vcm->workers_lock);
|
||||
|
||||
done:
|
||||
clib_spinlock_unlock (&vcm->workers_lock);
|
||||
return wrk;
|
||||
}
|
||||
|
||||
|
@ -1222,6 +1222,9 @@ list(APPEND VNET_HEADERS
|
||||
fib/fib.h
|
||||
fib/fib_api.h
|
||||
fib/ip4_fib.h
|
||||
fib/ip4_fib_8.h
|
||||
fib/ip4_fib_16.h
|
||||
fib/ip4_fib_hash.h
|
||||
fib/ip6_fib.h
|
||||
fib/fib_types.h
|
||||
fib/fib_table.h
|
||||
|
@ -351,6 +351,9 @@ ip6_icmp_echo_request (vlib_main_t * vm,
|
||||
vnet_buffer (p1)->sw_if_index[VLIB_RX]);
|
||||
vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
|
||||
|
||||
p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
|
||||
p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
|
||||
|
||||
/* verify speculative enqueues, maybe switch current next frame */
|
||||
/* if next0==next1==next_index then nothing special needs to be done */
|
||||
vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
|
||||
@ -404,6 +407,7 @@ ip6_icmp_echo_request (vlib_main_t * vm,
|
||||
vnet_buffer (p0)->sw_if_index[VLIB_RX]);
|
||||
vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
|
||||
|
||||
p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
|
||||
/* Verify speculative enqueue, maybe switch current next frame */
|
||||
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
|
||||
to_next, n_left_to_next,
|
||||
|
@ -38,6 +38,12 @@ configure_file(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/vnet/config.h
|
||||
)
|
||||
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/vnet/config.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vpp/vnet
|
||||
COMPONENT vpp-dev
|
||||
)
|
||||
|
||||
set(VPP_API_FILES
|
||||
api/vpe_types.api
|
||||
api/vpe.api
|
||||
|
Reference in New Issue
Block a user