Took care of code review comments. Extended the fix to other files.

Change-Id: I24e688884cd5896b317efb53e1d193f7d363715a
Signed-off-by: rangan <rangan@cisco.com>

diff --git a/vnet/vnet/l2/l2_classify.c b/vnet/vnet/l2/l2_classify.c
index a6c8ebb..449dea7 100644 (file)
--- a/vnet/vnet/l2/l2_classify.c
+++ b/vnet/vnet/l2/l2_classify.c
@@ -275,6 +275,7 @@ l2_classify_node_fn (vlib_main_t * vm,
           h0 = vlib_buffer_get_current(b0);
           table_index0 = vnet_buffer(b0)->l2_classify.table_index;
           e0 = 0;
+          vnet_buffer(b0)->l2_classify.opaque_index = ~0;
 
           if (PREDICT_TRUE(table_index0 != ~0))
             {

diff --git a/vnet/vnet/l2/l2_input_acl.c b/vnet/vnet/l2/l2_input_acl.c
index 77fa894..49df0f6 100644 (file)
--- a/vnet/vnet/l2/l2_input_acl.c
+++ b/vnet/vnet/l2/l2_input_acl.c
@@ -254,6 +254,7 @@ l2_inacl_node_fn (vlib_main_t * vm,
           /* Feature bitmap update */
           vnet_buffer(b0)->l2.feature_bitmap &= ~L2INPUT_FEAT_ACL;
 
+          vnet_buffer(b0)->l2_classify.opaque_index = ~0;
           /* Determine the next node */
           next0 = feat_bitmap_get_next_node_index(msm->feat_next_node_index,
                     vnet_buffer(b0)->l2.feature_bitmap);
@@ -267,6 +268,8 @@ l2_inacl_node_fn (vlib_main_t * vm,
                                              now);
               if (e0)
                 {
+                  vnet_buffer(b0)->l2_classify.opaque_index
+                    = e0->opaque_index;
                   vlib_buffer_advance (b0, e0->advance);
 
                   next0 = (e0->next_index < ACL_NEXT_INDEX_N_NEXT)?