[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1375146873-3192-5-git-send-email-horms@verge.net.au>
Date: Tue, 30 Jul 2013 10:14:33 +0900
From: Simon Horman <horms@...ge.net.au>
To: dev@...nvswitch.org, netdev@...r.kernel.org
Cc: Ravi K <rkerur@...il.com>, Isaku Yamahata <yamahata@...inux.co.jp>,
Jesse Gross <jesse@...ira.com>,
Pravin B Shelar <pshelar@...ira.com>,
jarno.rajahalme@....com, Joe Stringer <joe@...d.net.nz>
Subject: [PATCH v16 4/4] datapath: Enable multiple levels of MPLS pop
This is now sane as recirculation is implemented
Signed-off-by: Simon Horman <horms@...ge.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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists