CFM: Revert default MA and MD name.

Commit 84c5d450 "cfm: No longer allow configuration of ma_name and
md_name." changed the default MA and MD name for no reason.  This
could add needless complexity to situations where OVS instances
built before and after this commit need to speak CFM to each other.
This commit reverts to the old values.

diff --git a/lib/cfm.c b/lib/cfm.c
index ce48691089394bbb3fed5ee5f9996ff74541f7ad..e56ccab75eea36295fd4c0b52c244b8b102f04ec 100644 (file)
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -100,8 +100,8 @@ static void cfm_unixctl_show(struct unixctl_conn *, const char *args,
 static void
 cfm_generate_maid(struct cfm *cfm)
 {
-    const char *ovs_md_name = "ovs_md";
-    const char *ovs_ma_name = "ovs_ma";
+    const char *ovs_md_name = "ovs";
+    const char *ovs_ma_name = "ovs";
     uint8_t *ma_p;
     size_t md_len, ma_len;