commit 236653d6740f9f75e11d7d55ad75945741112125
author Charles Chan <rascov@gmail.com> Mon Mar 05 11:28:23 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Mon Mar 05 20:43:53 2018 +0000
tree 10ad7fa356dfda9f48fe2edeffaadfc5c724cca3
parent 53e4796d552a573147f7c804e2e754a28a171440

Address comments in gerrit 17355

Change-Id: I3c5c2a77ca8e427d14607fccc89b8fb1a1cd38bd

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java
index 8f7b622..232e5c6 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java
@@ -1158,18 +1158,17 @@
                 forTableId = UNICAST_ROUTING_TABLE;
             }
 
-            /*
-            // XXX decrementing IP ttl is done automatically for routing, this
+            // TODO decrementing IP ttl is done automatically for routing, this
             // action is ignored or rejected in ofdpa as it is not fully implemented
-            if (fwd.treatment() != null) {
-                for (Instruction instr : fwd.treatment().allInstructions()) {
-                    if (instr instanceof L3ModificationInstruction &&
-                            ((L3ModificationInstruction) instr).subtype() == L3SubType.DEC_TTL) {
-                        tb.deferred().add(instr);
-                    }
-                }
-            }
-            */
+            // if (fwd.treatment() != null) {
+            //     for (Instruction instr : fwd.treatment().allInstructions()) {
+            //         if (instr instanceof L3ModificationInstruction &&
+            //                 ((L3ModificationInstruction) instr).subtype() == L3SubType.DEC_TTL) {
+            //             tb.deferred().add(instr);
+            //         }
+            //     }
+            // }
+
         } else if (ethType.ethType().toShort() == Ethernet.TYPE_IPV6) {
             if (buildIpv6Selector(filteredSelector, fwd) < 0) {
                 return Collections.emptyList();
@@ -1182,18 +1181,16 @@
                 forTableId = UNICAST_ROUTING_TABLE;
             }
 
-            // XXX decrementing IP ttl is done automatically for routing, this
+            // TODO decrementing IP ttl is done automatically for routing, this
             // action is ignored or rejected in ofdpa as it is not fully implemented
-            /*
-            if (fwd.treatment() != null) {
-                for (Instruction instr : fwd.treatment().allInstructions()) {
-                    if (instr instanceof L3ModificationInstruction &&
-                            ((L3ModificationInstruction) instr).subtype() == L3SubType.DEC_TTL) {
-                        tb.deferred().add(instr);
-                    }
-                }
-            }
-            */
+            // if (fwd.treatment() != null) {
+            //     for (Instruction instr : fwd.treatment().allInstructions()) {
+            //         if (instr instanceof L3ModificationInstruction &&
+            //                 ((L3ModificationInstruction) instr).subtype() == L3SubType.DEC_TTL) {
+            //             tb.deferred().add(instr);
+            //         }
+            //     }
+            // }
         } else {
             filteredSelector
                 .matchEthType(Ethernet.MPLS_UNICAST)