From: Ben Pfaff <blp@nicira.com>
Date: Wed, 4 Sep 2013 20:37:56 +0000 (-0700)
Subject: ofproto: Convert units correctly in ofport_open().
X-Git-Tag: sliver-openvswitch-2.0.90-1~16^2~29
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cd65125d97da87d2d3f9b7e8e2d35b6dd25ac6d3;p=sliver-openvswitch.git

ofproto: Convert units correctly in ofport_open().

netdev_features_to_bps() returns a speed in bps, but struct
ofputil_phy_port's curr_speed and max_speed are in kbps, so a conversion
is necessary.  This commit fixes the problem.

Reported-by: Benjamin Lunsky <benjamin.lunsky@netronome.com>
Tested-by: Benjamin Lunsky <benjamin.lunsky@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 97f26ae1b..5f5cd801a 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1847,8 +1847,8 @@ ofport_open(struct ofproto *ofproto,
     pp->state = netdev_get_carrier(netdev) ? 0 : OFPUTIL_PS_LINK_DOWN;
     netdev_get_features(netdev, &pp->curr, &pp->advertised,
                         &pp->supported, &pp->peer);
-    pp->curr_speed = netdev_features_to_bps(pp->curr, 0);
-    pp->max_speed = netdev_features_to_bps(pp->supported, 0);
+    pp->curr_speed = netdev_features_to_bps(pp->curr, 0) / 1000;
+    pp->max_speed = netdev_features_to_bps(pp->supported, 0) / 1000;
 
     return netdev;
 }