From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 31 May 2013 23:28:36 +0000 (+0200)
Subject: virsh iface-bridge: Ignore delay if stp is turned off
X-Git-Tag: v1.1.0-rc1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a923865a0e0e7d8dc1bcd08a0b13a1a7e3cb20a7;p=thirdparty%2Flibvirt.git

virsh iface-bridge: Ignore delay if stp is turned off

Delay only makes sense with STP enabled.
---

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 1c2e40baf9..2bdb2150e1 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -894,7 +894,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }
 
-    if ((delay || stp) &&
+    if (stp &&
         ((virAsprintf(&delay_str, "%d", delay) < 0) ||
          !xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str))) {
         vshError(ctl, _("Failed to set bridge delay %d in xml document"), delay);