[VOL-2517] Using VLAN ANY (4096) to check for tagged ONU traffic instead of valid 4095

Change-Id: Ifeaddb257042b662e2c0dbf6d57fea9153f6870a
diff --git a/VERSION b/VERSION
index 9fa5f12..f470771 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.10
+2.3.11
diff --git a/internal/pkg/core/openolt_flowmgr.go b/internal/pkg/core/openolt_flowmgr.go
index fe03a79..3ed340f 100644
--- a/internal/pkg/core/openolt_flowmgr.go
+++ b/internal/pkg/core/openolt_flowmgr.go
@@ -79,10 +79,8 @@
 	//IgmpProto proto value
 	IgmpProto = 2
 
-	//FIXME - see also BRDCM_DEFAULT_VLAN in broadcom_onu.py
-
-	//ReservedVlan Transparent Vlan
-	ReservedVlan = 4095
+	//ReservedVlan Transparent Vlan (Masked Vlan, VLAN_ANY in ONOS Flows)
+	ReservedVlan = 4096
 
 	//DefaultMgmtVlan default vlan value
 	DefaultMgmtVlan = 4091
@@ -1042,8 +1040,8 @@
 	classifier.EthType, _ = classifierInfo[EthType].(uint32)
 	classifier.IpProto, _ = classifierInfo[IPProto].(uint32)
 	if vlanID, ok := classifierInfo[VlanVid].(uint32); ok {
-		vid := vlanID & VlanvIDMask
-		if vid != ReservedVlan {
+		if vlanID != ReservedVlan {
+			vid := vlanID & VlanvIDMask
 			classifier.OVid = vid
 		}
 	}