diff options
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/classify/flow_classify_node.c | 2 | ||||
| -rw-r--r-- | vnet/vnet/ip/ip6_neighbor.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vnet/vnet/classify/flow_classify_node.c b/vnet/vnet/classify/flow_classify_node.c index aa3bce5467a..5c9e0820a26 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 fdec2d4a0f2..97e7e84ac42 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 ; |