From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 26 May 2011 01:23:31 +0000 (-0700)
Subject: CFM: Revert default MA and MD name.
X-Git-Tag: v1.2.0~279
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=db16e36ed14cf7c50646e356a2b2401e23fcea70;p=sliver-openvswitch.git

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 ce4869108..e56ccab75 100644
--- 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;