From 4ac064505df316487e9c31ddd3fe83d042056e63 Mon Sep 17 00:00:00 2001 From: Nithin Raju Date: Wed, 25 Nov 2015 12:32:33 -0800 Subject: [PATCH] datapath-windows: Don't assert for unknown actions On Hyper-V, we currently don't validate a flow to see if datapath can indeed execute all the actions specified or not. While support for it gets implemented, an ASSERT seems too strong. I'm working on the support for actions validation. Here's a workaround in the meantime to help debugging. Signed-off-by: Nithin Raju Acked-by: Sairam Venugopal Signed-off-by: Ben Pfaff --- datapath-windows/ovsext/Actions.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c index e9029834f..7d3445857 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -1360,22 +1360,10 @@ OvsExecuteSetAction(OvsForwardingContext *ovsFwdCtx, RtlCopyMemory(&ovsFwdCtx->tunKey, &tunKey, sizeof ovsFwdCtx->tunKey); break; } - case OVS_KEY_ATTR_SKB_MARK: - /* XXX: Not relevant to Hyper-V. Return OK */ - break; - case OVS_KEY_ATTR_UNSPEC: - case OVS_KEY_ATTR_ENCAP: - case OVS_KEY_ATTR_ETHERTYPE: - case OVS_KEY_ATTR_IN_PORT: - case OVS_KEY_ATTR_VLAN: - case OVS_KEY_ATTR_ICMP: - case OVS_KEY_ATTR_ICMPV6: - case OVS_KEY_ATTR_ARP: - case OVS_KEY_ATTR_ND: - case __OVS_KEY_ATTR_MAX: + default: - OVS_LOG_INFO("Unhandled attribute %#x", type); - ASSERT(FALSE); + OVS_LOG_INFO("Unhandled attribute %#x", type); + break } return status; } -- 2.39.5