From f3d08aa0ba9e803c282c4608b2a6be94905b73c9 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Tue, 25 Jun 2013 11:49:34 +0100 Subject: [PATCH] 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. --- src/util/virnetdevbridge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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, ¶m, sizeof(param)) < 0) { virReportSystemError(errno, -- 2.47.2