diff options
| author |   Damjan Marion <damarion@cisco.com> | 2015-12-18 10:26:56 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2015-12-18 13:31:56 +0100 |
| commit | 2c29d75021d684559146e656aac85f0c14ffb5ab (patch) | |
| tree | f170a34ab269e94ab8c98ff77cd591e1f63157eb /vnet/vnet/map | |
| parent | 5f1fd813c2773870ca92510c4e49a18810e9a4c8 (diff) | |
Fix warnings/errors reported by clang
Change-Id: Ifb2de64347526e3218e22067452f249ff878fd32
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/map')
| -rw-r--r-- | vnet/vnet/map/ip4_map.c | 2 | ||||
| -rw-r--r-- | vnet/vnet/map/ip6_map_t.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vnet/vnet/map/ip4_map.c b/vnet/vnet/map/ip4_map.c index cf53ef4918c..559275eb586 100644 --- a/vnet/vnet/map/ip4_map.c +++ b/vnet/vnet/map/ip4_map.c @@ -130,7 +130,7 @@ ip4_map_vtcfl (ip4_header_t *ip4, vlib_buffer_t *p) u8 tc = mm->tc_copy ? ip4->tos : mm->tc; u32 vtcfl = 0x6 << 28; vtcfl |= tc << 20; - vtcfl |= vnet_buffer(p)->ip.flow_hash && 0x000fffff; + vtcfl |= vnet_buffer(p)->ip.flow_hash & 0x000fffff; return (clib_host_to_net_u32(vtcfl)); } diff --git a/vnet/vnet/map/ip6_map_t.c b/vnet/vnet/map/ip6_map_t.c index 7720e06fba4..b2c102ac3e7 100644 --- a/vnet/vnet/map/ip6_map_t.c +++ b/vnet/vnet/map/ip6_map_t.c @@ -451,7 +451,7 @@ ip6_map_t_fragmented (vlib_main_t *vm, u16 frag_id0, frag_offset0, frag_id1, frag_offset1; u8 frag_more0, frag_more1; - ip6_mapt_fragmented_next_t next0, next1; + u32 next0, next1; pi0 = to_next[0] = from[0]; pi1 = to_next[1] = from[1]; @@ -536,7 +536,7 @@ ip6_map_t_fragmented (vlib_main_t *vm, u16 frag_id0; u8 frag_more0; u16 frag_offset0; - ip6_mapt_fragmented_next_t next0; + u32 next0; pi0 = to_next[0] = from[0]; from += 1; |