X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_learn.c;h=adc5e70f4933f4141bf5855e9d4b3cfd0c98b0c8;hb=7537e717d1ca6de0e33478bc50b9f7125f04c808;hp=faed0d6609dfee96c9342a4a7f438de5bba37630;hpb=57d7dbc8bf8a49ee2421fe97bd3ed7099d2384bf;p=vpp.git

diff --git a/src/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c
index faed0d6609d..adc5e70f493 100644
--- a/src/vnet/l2/l2_learn.c
+++ b/src/vnet/l2/l2_learn.c
@@ -141,10 +141,8 @@ l2learn_process (vlib_node_runtime_t * node,
       if (PREDICT_FALSE (result0->fields.timestamp != timestamp))
 	result0->fields.timestamp = timestamp;
       if (PREDICT_FALSE
-	  (result0->fields.int_sn != vnet_buffer (b0)->l2.int_sn))
-	result0->fields.int_sn = vnet_buffer (b0)->l2.int_sn;
-      if (PREDICT_FALSE (result0->fields.bd_sn != vnet_buffer (b0)->l2.bd_sn))
-	result0->fields.bd_sn = vnet_buffer (b0)->l2.bd_sn;
+	  (result0->fields.sn.as_u16 != vnet_buffer (b0)->l2.l2fib_sn))
+	result0->fields.sn.as_u16 = vnet_buffer (b0)->l2.l2fib_sn;
     }
   else if (result0->raw == ~0)
     {
@@ -171,8 +169,7 @@ l2learn_process (vlib_node_runtime_t * node,
 	  result0->raw = 0;	/* clear all fields */
 	  result0->fields.sw_if_index = sw_if_index0;
 	  result0->fields.timestamp = timestamp;
-	  result0->fields.bd_sn = vnet_buffer (b0)->l2.bd_sn;
-	  result0->fields.int_sn = vnet_buffer (b0)->l2.int_sn;
+	  result0->fields.sn.as_u16 = vnet_buffer (b0)->l2.l2fib_sn;
 	  kv.key = key0->raw;
 	  kv.value = result0->raw;
 
@@ -210,8 +207,7 @@ l2learn_process (vlib_node_runtime_t * node,
 	  result0->raw = 0;	/* clear all fields */
 	  result0->fields.sw_if_index = sw_if_index0;
 	  result0->fields.timestamp = timestamp;
-	  result0->fields.bd_sn = vnet_buffer (b0)->l2.bd_sn;
-	  result0->fields.int_sn = vnet_buffer (b0)->l2.int_sn;
+	  result0->fields.sn.as_u16 = vnet_buffer (b0)->l2.l2fib_sn;
 
 	  kv.key = key0->raw;
 	  kv.value = result0->raw;