[ONOS-7285][ONOS-7263] VLAN support by fabric.p4

Change-Id: I9ea460bca2698eb74f0d4988830a1e7cc7bc2768
diff --git a/pipelines/fabric/src/main/resources/include/control/filtering.p4 b/pipelines/fabric/src/main/resources/include/control/filtering.p4
index 58bf147..4f6e688 100644
--- a/pipelines/fabric/src/main/resources/include/control/filtering.p4
+++ b/pipelines/fabric/src/main/resources/include/control/filtering.p4
@@ -45,8 +45,8 @@
         hdr.ethernet.ether_type = ETHERTYPE_VLAN;
         set_vlan(new_vlan_id);
 
-        // pop internal vlan before output
-        fabric_metadata.pop_vlan_at_egress = true;
+        // pop internal vlan before packet in
+        fabric_metadata.pop_vlan_when_packet_in = true;
     }
 
     action set_forwarding_type(fwd_type_t fwd_type) {