From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Tue, 25 Jun 2013 10:49:34 +0000 (+0100)
Subject: Fix units in virNetDevBridgeSetSTPDelay on BSD
X-Git-Tag: v1.1.0-rc2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d08aa0ba9e803c282c4608b2a6be94905b73c9;p=thirdparty%2Flibvirt.git

Fix units in virNetDevBridgeSetSTPDelay on BSD

virNetDevBridgeSetSTPDelay accepts delay in milliseconds,
but BSD implementation was expecting seconds. Therefore,
it was working correctly only with delay == 0.
---

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index ffcb4a4fac..9d95374a0a 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -593,10 +593,11 @@ int virNetDevBridgeSetSTPDelay(const char *brname,
                                int delay)
 {
     struct ifbrparam param;
+    u_long delay_seconds = delay / 1000;
 
     /* FreeBSD doesn't allow setting STP delay < 4 */
-    delay = delay < 4 ? 4 : delay;
-    param.ifbrp_fwddelay = ((u_long)delay) & 0xff;
+    delay_seconds = delay_seconds < 4 ? 4 : delay_seconds;
+    param.ifbrp_fwddelay = delay_seconds & 0xff;
 
     if (virNetDevBridgeCmd(brname, BRDGSFD, &param, sizeof(param)) < 0) {
         virReportSystemError(errno,