]> xenbits.xensource.com Git - libvirt.git/commitdiff
virsh iface-bridge: Ignore delay if stp is turned off
authorJiri Denemark <jdenemar@redhat.com>
Fri, 31 May 2013 23:28:36 +0000 (01:28 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 3 Jun 2013 13:15:44 +0000 (15:15 +0200)
Delay only makes sense with STP enabled.

tools/virsh-interface.c

index 1c2e40baf970d1ac867c6e91c6011fce3a50789c..2bdb2150e17076eeb0f0396af55e551a181317c6 100644 (file)
@@ -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);