- super.setDataLayerVirtualLanPriorityCodePoint(getVlanPCP(firstByte));
- super.setDataLayerVirtualLan(getVlanID(firstByte, secondByte));
+ if (firstByte == 0 && secondByte == 0) {
+ // Match only packets without VLAN tag.
+ setDataLayerVirtualLan(OFP_VLAN_NONE);
+ } else if (((firstByte << 8) & VLAN_TCI_CFI) == 0) {
+ // Ignore invalid TCI field.
+ return;
+ } else {
+ super.setDataLayerVirtualLanPriorityCodePoint(getVlanPCP(firstByte));
+ super.setDataLayerVirtualLan(getVlanID(firstByte, secondByte));
+ this.wildcards ^= (1 << 20);
+ }