[ovs-dev] [PATCH v7 2/3] ofp-actions: Allow pop_mpls on MPLS packets

[Simon Horman]

With recirculation in place this should be safe.

Signed-off-by: Simon Horman <ho...@verge.net.au>

---
v2 - v5
* No change
---
 lib/ofp-actions.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index dc74e8a..9849771 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -492,9 +492,6 @@ ofpact_from_nxast(const union ofp_action *a, enum 
ofputil_action_code code,
         break;
 
     case OFPUTIL_NXAST_POP_MPLS:
-        if (eth_type_mpls(a->pop_mpls.ethertype)) {
-            return OFPERR_OFPBAC_BAD_ARGUMENT;
-        }
         ofpact_put_POP_MPLS(out)->ethertype = a->pop_mpls.ethertype;
         break;
 
@@ -1260,9 +1257,6 @@ ofpact_from_openflow11(const union ofp_action *a, enum 
ofp_version version,
         break;
 
     case OFPUTIL_OFPAT11_POP_MPLS:
-        if (eth_type_mpls(a->ofp11_pop_mpls.ethertype)) {
-            return OFPERR_OFPBAC_BAD_ARGUMENT;
-        }
         ofpact_put_POP_MPLS(out)->ethertype = a->ofp11_pop_mpls.ethertype;
         break;
 
-- 
2.0.0.rc2

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev