From 1946a12a52deddfb501d2bdf320ff280cb42a076 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 12 Oct 2016 17:32:39 -0400 Subject: Fix coverity warnings, VPP-486 Change-Id: I7a14d9a28514cdb49f65fab1b120b53239fed7e3 Signed-off-by: Dave Barach --- vnet/vnet/classify/flow_classify_node.c | 2 +- vnet/vnet/ip/ip6_neighbor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/classify/flow_classify_node.c b/vnet/vnet/classify/flow_classify_node.c index aa3bce54..5c9e0820 100644 --- a/vnet/vnet/classify/flow_classify_node.c +++ b/vnet/vnet/classify/flow_classify_node.c @@ -267,7 +267,7 @@ flow_classify_inline (vlib_main_t * vm, t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX]; t->next_index = next0; t->table_index = t0 ? t0 - vcm->tables : ~0; - t->offset = e0 ? vnet_classify_get_offset (t0, e0): ~0; + t->offset = (t0 && e0) ? vnet_classify_get_offset (t0, e0): ~0; } /* Verify speculative enqueue, maybe switch current next frame */ diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c index fdec2d4a..97e7e84a 100644 --- a/vnet/vnet/ip/ip6_neighbor.c +++ b/vnet/vnet/ip/ip6_neighbor.c @@ -1705,7 +1705,7 @@ ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm, a->seed = random_default_seed(); /* for generating random interface ids */ - a->randomizer = 0x1119194911191949; + a->randomizer = 0x1119194911191949ULL; a->randomizer = random_u64 ((u32 *)&a->randomizer); a->initial_adverts_count = MAX_INITIAL_RTR_ADVERTISEMENTS ; -- cgit