diff options
| author |   Dave Barach <dave@barachs.net> | 2017-03-08 19:08:56 -0500 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2017-03-09 19:07:17 +0000 |
| commit | 80f54e20270ed0628ee725e3e3c515731a0188f2 (patch) | |
| tree | fa06d939942af6f5126ee645c38cb787814bfb6f /src/vlib/node_funcs.h | |
| parent | b3b2de71ceea0cc7ce18f89cc8180ed4a42e355d (diff) | |
vlib_mains == 0 special cases be gone
Clean up spurious binary API client link dependency on libvlib.so,
which managed to hide behind vlib_mains == 0 checks reached by
VLIB_xxx_FUNCTION macros.
Change-Id: I5df1f8ab07dca1944250e643ccf06e60a8462325
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vlib/node_funcs.h')
| -rw-r--r-- | src/vlib/node_funcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h index f49a8d6fa75..8ccfc438020 100644 --- a/src/vlib/node_funcs.h +++ b/src/vlib/node_funcs.h @@ -201,7 +201,7 @@ vlib_get_frame_no_check (vlib_main_t * vm, uword frame_index) vlib_frame_t *f; u32 cpu_index = frame_index & VLIB_CPU_MASK; u32 offset = frame_index & VLIB_OFFSET_MASK; - vm = vlib_mains ? vlib_mains[cpu_index] : vm; + vm = vlib_mains[cpu_index]; f = vm->heap_base + offset; return f; } @@ -213,7 +213,7 @@ vlib_frame_index_no_check (vlib_main_t * vm, vlib_frame_t * f) ASSERT (((uword) f & VLIB_CPU_MASK) == 0); - vm = vlib_mains ? vlib_mains[f->cpu_index] : vm; + vm = vlib_mains[f->cpu_index]; i = ((u8 *) f - (u8 *) vm->heap_base); return i | f->cpu_index; |