X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Futil%2FMatchSerializer.java;h=bde832c0206aae3ab089da9dd8e00c51cbd5e56e;hb=55670826f95d73afa4292f8cf729778e38d07aeb;hp=d4729f6b2aafc637ebaff08b625788e60a0cd8f9;hpb=58d3805deba3b135427167cdd5bea1024a4e3c91;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
index d4729f6b..bde832c0 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
@@ -187,9 +187,10 @@ public class MatchSerializer {
             fieldValue = 6;
             fieldValue = fieldValue << 1;
             VlanVidMatchEntry vlanVid = entry.getAugmentation(VlanVidMatchEntry.class);
-            int vlanVidValue = vlanVid.getVlanVid() << 1;
+            int vlanVidValue = vlanVid.getVlanVid();
             if (vlanVid.isCfiBit()) {
-                vlanVidValue = vlanVidValue | 1;
+                short cfi = 1 << 12; // 13-th bit
+                vlanVidValue = vlanVidValue | cfi;
             }
             if (entry.isHasMask()) {
                 fieldValue = fieldValue | 1;