From b4d66748123510980af4a45b96b2eb6cf4f1fcbe Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 31 Jan 2014 15:47:58 -0800 Subject: [PATCH] datapth: Suppress error messages on megaflow updates With subfacets, we'd expect megaflow updates message to carry the original micro flow. If not, EINVAL is returned and kernel logs an error message. Now that the user space subfacet layer is removed, it is expected that flow updates can arrive with a micro flow other than the original. Change the return code to EEXIST and remove the kernel error log message. Reported-by: Ben Pfaff Signed-off-by: Andy Zhou Acked-by: Jesse Gross --- datapath/datapath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index f045fe4b5..5f1b34cbf 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -862,11 +862,8 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info) goto err_unlock_ovs; /* The unmasked key has to be the same for flow updates. */ - error = -EINVAL; - if (!ovs_flow_cmp_unmasked_key(flow, &match)) { - OVS_NLERR("Flow modification message rejected, unmasked key does not match.\n"); + if (!ovs_flow_cmp_unmasked_key(flow, &match)) goto err_unlock_ovs; - } /* Update actions. */ old_acts = ovsl_dereference(flow->sf_acts); -- 2.20.1