summaryrefslogtreecommitdiffstats
path: root/vnet/vnet/map/ip6_map.c
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-08-12 11:42:26 -0700
committerEd Warnicke <eaw@cisco.com>2016-08-12 12:07:54 -0700
commit853e720fdd74b1ffb1168c1503cd97eb5b7f8b60 (patch)
tree6179a62bebb59afa409268a88f2b6d9d9a3702ad /vnet/vnet/map/ip6_map.c
parentc1be59d3eb92096f7403ad5b3c3e7cbd78ba0b96 (diff)
VPP-237: indent fixes in prep for checkstyle
Ran indent *twice* Change-Id: If9c18b81983bb859cc8dc3b415c67cbf318fc618 Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'vnet/vnet/map/ip6_map.c')
-rw-r--r--vnet/vnet/map/ip6_map.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/vnet/vnet/map/ip6_map.c b/vnet/vnet/map/ip6_map.c
index b51e8358d41..44f0e5dd677 100644
--- a/vnet/vnet/map/ip6_map.c
+++ b/vnet/vnet/map/ip6_map.c
@@ -870,11 +870,11 @@ ip6_map_ip4_reass (vlib_main_t * vm,
map_ip4_reass_lock ();
//This node only deals with fragmented ip4
- map_ip4_reass_t *r =
- map_ip4_reass_get (ip40->src_address.as_u32,
- ip40->dst_address.as_u32,
- ip40->fragment_id, ip40->protocol,
- &fragments_to_drop);
+ map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
+ ip40->dst_address.as_u32,
+ ip40->fragment_id,
+ ip40->protocol,
+ &fragments_to_drop);
if (PREDICT_FALSE (!r))
{
// Could not create a caching entry
@@ -968,8 +968,8 @@ ip6_map_ip4_reass (vlib_main_t * vm,
vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
cpu_index, map_domain_index0,
1,
- clib_net_to_host_u16 (ip40->
- length));
+ clib_net_to_host_u16
+ (ip40->length));
next0 =
(error0 ==
MAP_ERROR_NONE) ? next0 : IP6_MAP_IP4_REASS_NEXT_DROP;
@@ -1113,8 +1113,7 @@ ip6_map_icmp_relay (vlib_main_t * vm,
/* Check DF flag */
if (!
- (inner_ip40->
- flags_and_fragment_offset &
+ (inner_ip40->flags_and_fragment_offset &
clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT)))
{
error0 = MAP_ERROR_ICMP_RELAY;