[PATCH net 5/5] openvswitch: Suppress error messages on megaflow updates
From: Jesse Gross <hidden>
Date: 2014-02-03 01:08:06
Subsystem:
networking [general], openvswitch, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Aaron Conole, Eelco Chaudron, Ilya Maximets, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2014-02-05 · [PATCH net 5/5] openvswitch: Suppress error messages on megaflow updates · Jesse Gross <hidden>
From: Andy Zhou <redacted> 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 <redacted> Signed-off-by: Andy Zhou <redacted> Signed-off-by: Jesse Gross <redacted> --- net/openvswitch/datapath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 8b392cc..947a9a8 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c@@ -857,11 +857,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);
--
1.8.3.2