diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-10-17 13:54:59 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2016-10-17 12:58:19 +0000 |
| commit | e11a282cc6ab240417da379ea0367d034e2a87c8 (patch) | |
| tree | fb191f7033901ab0dbe178e4756f4db70f02ed53 | |
| parent | e33b9e0a878265bcbeb3290494b82b16d0f65827 (diff) | |
oam: fix compilation with gcc6
gcc6 reports:
vpp/oam/oam.c:560:531: error: self-comparison always evaluates to true
[-Werror=tautological-compare]
Change-Id: I7a086099c14c6661d0c6b4cf0370631fc06bc23d
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | vpp/oam/oam.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vpp/oam/oam.c b/vpp/oam/oam.c index 600817c9b7f..8bf46cda351 100644 --- a/vpp/oam/oam.c +++ b/vpp/oam/oam.c @@ -455,7 +455,8 @@ oam_node_fn (vlib_main_t * vm, u32 n_left_from, *from, *to_next; oam_next_t next_index; oam_main_t *om = &oam_main; - u32 next01 = OAM_NEXT_DROP; /* all pkts go to the hopper... */ + u32 next0 = OAM_NEXT_DROP; /* all pkts go to the hopper... */ + u32 next1 = OAM_NEXT_DROP; uword *u0, *u1; oam_template_t *oam0, *oam1; u32 fib_index0, fib_index1; @@ -554,12 +555,12 @@ oam_node_fn (vlib_main_t * vm, } if (vm->os_punt_frame) - next01 = OAM_NEXT_PUNT; + next0 = next1 = OAM_NEXT_PUNT; /* verify speculative enqueues, maybe switch current next frame */ vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next, n_left_to_next, - bi0, bi1, next01, next01); + bi0, bi1, next0, next1); } while (n_left_from > 0 && n_left_to_next > 0) @@ -603,12 +604,12 @@ oam_node_fn (vlib_main_t * vm, } if (vm->os_punt_frame) - next01 = OAM_NEXT_PUNT; + next0 = OAM_NEXT_PUNT; /* verify speculative enqueue, maybe switch current next frame */ vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, - bi0, next01); + bi0, next0); } vlib_put_next_frame (vm, node, next_index, n_left_to_next); |