This is now sane as recirculation is implemented

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

---

v16
* First post
---
 datapath/datapath.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/datapath/datapath.c b/datapath/datapath.c
index c8143b9..eb14b23 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1007,16 +1007,7 @@ static int validate_and_copy_actions__(const struct 
nlattr *attr,
                                if (!eth_p_mpls(eth_types->types[i]))
                                        return -EINVAL;
 
-                       /* Disallow subsequent L2.5+ set and mpls_pop actions
-                        * as there is no check here to ensure that the new
-                        * eth_type is valid and thus set actions could
-                        * write off the end of the packet or otherwise
-                        * corrupt it.
-                        *
-                        * Support for these actions is planned using packet
-                        * recirculation.
-                        */
-                       eth_types_set(eth_types, htons(0));
+                       eth_types_set(eth_types, nla_get_be16(a));
                        break;
                }
 
-- 
1.8.3.2

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

Reply via email to