From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 9 Dec 2011 12:04:14 +0000 (+0100)
Subject: bridge: Fix forward delay APIs
X-Git-Tag: v0.9.9-rc1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5046d31f4f5c961fc4aa6b415a00bb9eadae2b;p=thirdparty%2Flibvirt.git

bridge: Fix forward delay APIs

Due to copy&paste error in c1df2c14b590b3d68b707aa4f3a570f95a6bc548,
virNetDevBridge[SG]etSTPDelay APIs were accessing wrong file.
---

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index e246b2c53d..08c8f5cc59 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -395,7 +395,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname,
     if ((fd = virNetDevSetupControl(brname, &ifr)) < 0)
         goto cleanup;
 
-    ret = virNetDevBridgeSet(brname, "stp_state", MS_TO_JIFFIES(delay),
+    ret = virNetDevBridgeSet(brname, "forward_delay", MS_TO_JIFFIES(delay),
                              fd, &ifr);
 
 cleanup:
@@ -426,7 +426,7 @@ int virNetDevBridgeGetSTPDelay(const char *brname,
     if ((fd = virNetDevSetupControl(brname, &ifr)) < 0)
         goto cleanup;
 
-    ret = virNetDevBridgeGet(brname, "stp_state", &i,
+    ret = virNetDevBridgeGet(brname, "forward_delay", &i,
                              fd, &ifr);
     *delayms = JIFFIES_TO_MS(i);