From: Eyal Bari <ebari@cisco.com>
Date: Tue, 18 Jul 2017 10:25:19 +0000 (+0300)
Subject: L2FWD:move vec_validate out of access function
X-Git-Tag: v17.10-rc1~330
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b12ac56c44f4f6d4d5e3bc37bba39b19bc6b2551;p=vpp.git

L2FWD:move vec_validate out of access function

Change-Id: Id9737b6aa2b6fe3032f4627dfdbd2ea728cc3fb1
Signed-off-by: Eyal Bari <ebari@cisco.com>
---

diff --git a/src/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h
index 21dcc4513e0..ee6f0dc56a4 100644
--- a/src/vnet/l2/l2_fib.h
+++ b/src/vnet/l2/l2_fib.h
@@ -383,10 +383,17 @@ static_always_inline u8 *
 l2fib_swif_seq_num (u32 sw_if_index)
 {
   l2fib_main_t *mp = &l2fib_main;
-  vec_validate (mp->swif_seq_num, sw_if_index);
   return vec_elt_at_index (mp->swif_seq_num, sw_if_index);
 }
 
+static_always_inline u8 *
+l2fib_valid_swif_seq_num (u32 sw_if_index)
+{
+  l2fib_main_t *mp = &l2fib_main;
+  vec_validate (mp->swif_seq_num, sw_if_index);
+  return l2fib_swif_seq_num (sw_if_index);
+}
+
 BVT (clib_bihash) * get_mac_table (void);
 
 #endif
diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index 9a3148c533a..aa15621320e 100644
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -618,7 +618,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main,	/*           */
 	  config->xconnect = 0;
 	  config->bridge = 1;
 	  config->bd_index = bd_index;
-	  *l2fib_swif_seq_num (sw_if_index) += 1;
+	  *l2fib_valid_swif_seq_num (sw_if_index) += 1;
 
 	  /*
 	   * Enable forwarding, flooding, learning and ARP termination by default