commit 563139055f6d2e27ff1ae658086d2f768d3122a4
author Sangho Shin <sangho@onlab.us> Mon Nov 10 23:29:46 2014 -0800
committer Sangho Shin <sangho@onlab.us> Mon Nov 10 23:30:26 2014 -0800
tree ec018cbe933a7793d84b5131dc19faae6e6d1353
parent 343d7679c26608f5e8a73b2c76f644a51b61f3ee

Fix a bug in a driver related to MPLS MAC setting

Change-Id: I433de1430152b9e255a6fac8b8c1134dd64c92e4

src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplDellOSR.java

diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplDellOSR.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplDellOSR.java
index f5f9c5d..07522a0 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplDellOSR.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplDellOSR.java
@@ -146,12 +146,13 @@
 
         int flowType = 0x00;
         PortNumber outPort = null;
-        if (mplsm.isBos()) {
-            flowType |= 0x01;
-        }
         for (Action action : ma.getActions()) {
-            if (action instanceof PopMplsAction)
+            if (action instanceof PopMplsAction) {
                 flowType |= 0x10;
+                if (mplsm.isBos()) {
+                    flowType |= 0x01;
+                }
+            }
             else if (action instanceof OutputAction)
                 outPort = ((OutputAction) action).getPortNumber();
         }