From: Anoob Soman <anoob.soman@citrix.com>
Date: Wed, 2 Jan 2013 17:23:07 +0000 (+0000)
Subject: lacp: Fix dumping of the aggregation key.
X-Git-Tag: sliver-openvswitch-1.9.90-3~10^2~53
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ab3a09c87863526ca31a36fc21877c2ce505e447;p=sliver-openvswitch.git

lacp: Fix dumping of the aggregation key.

While dumping lacp information using ovs-appctl, the "aggregation
key" field displays the port_id even though the aggregation key is
set using "other-config:lacp-aggregation-key".

Signed-off-by: Anoob Soman <anoob.soman@citrix.com>
Signed-off-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/lib/lacp.c b/lib/lacp.c
index 374d915a9..96857ea51 100644
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -750,7 +750,9 @@ lacp_print_details(struct ds *ds, struct lacp *lacp)
     ds_put_format(ds, "\tsys_priority: %u\n", lacp->sys_priority);
     ds_put_cstr(ds, "\taggregation key: ");
     if (lacp->key_slave) {
-        ds_put_format(ds, "%u", lacp->key_slave->port_id);
+        ds_put_format(ds, "%u", lacp->key_slave->key
+                                ? lacp->key_slave->key
+                                : lacp->key_slave->port_id);
     } else {
         ds_put_cstr(ds, "none");
     }