From 717c48fe35647ed375b13bdf0e22d84e76fd96d8 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 24 Jun 2014 08:46:32 +0900 Subject: [PATCH 1/1] ofp-actions: Allow pop_mpls on MPLS packets With recirculation in place this should be safe. Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- lib/ofp-actions.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index dc74e8ac7..984977125 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.20.1