Wed Nov 21 11:36:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

	* src/bridge.c, src/qemu_driver.c: Incorrect call to
	  brSetForwardDelay changed to brSetEnableSTP.

diff --git a/ChangeLog b/ChangeLog
index 7e22760c69839855556d091978d633da26cb9dfc..0ead76695d43ca82ed455314059d8cc69d686d42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 21 11:36:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/bridge.c, src/qemu_driver.c: Incorrect call to
+         brSetForwardDelay changed to brSetEnableSTP.
+
 Wed Nov 21 11:36:43 CET 2007 Daniel Veillard <veillard@redhat.com>
 
        * docs/index.html docs/libvir.html: apply english corrections

diff --git a/src/bridge.c b/src/bridge.c
index 457b5d72adb3a0c82b34c88566a330ce3e26b573..96068f735c0a76ab6265d5ac820f373fbf210ab9 100644 (file)
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -731,7 +731,7 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED,
     int n;
 
     n = 1 + /* brctl */
-        1 + /* setfd */
+        1 + /* stp */
         1 + /* brige name */
         1;  /* value */
 

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index da690fa7661ff1d332988a89afc06482a03a580c..4462a326a9e163a28dfcdd40972875be2fca2232 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1159,7 +1159,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn,
         goto err_delbr;
     }
 
-    if ((err = brSetForwardDelay(driver->brctl, network->bridge, network->def->disableSTP ? 0 : 1))) {
+    if ((err = brSetEnableSTP(driver->brctl, network->bridge, network->def->disableSTP ? 0 : 1))) {
         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
                          "failed to set bridge STP to %s\n",
                          network->def->disableSTP ? "off" : "on");