From: Ben Pfaff <blp@nicira.com>
Date: Tue, 14 Aug 2012 20:25:32 +0000 (-0700)
Subject: vswitch.xml: Generalize "carrier" to cover miimon also.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c1440518a878c0897d17cb1ebbc95466715d316;p=openvswitch

vswitch.xml: Generalize "carrier" to cover miimon also.

I believe that saying "carrier" here excludes the miimon case, which we'd
like to include also.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 4a0225c5..ebbfba80 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -896,7 +896,7 @@
 
         <column name="bond_updelay">
           <p>
-            The number of milliseconds for which carrier must stay up on an
+            The number of milliseconds for which the link must stay up on an
             interface before the interface is considered to be up.  Specify
             <code>0</code> to enable the interface immediately.
           </p>
@@ -909,7 +909,7 @@
         </column>
 
         <column name="bond_downdelay">
-          The number of milliseconds for which carrier must stay down on an
+          The number of milliseconds for which the link must stay down on an
           interface before the interface is considered to be down.  Specify
           <code>0</code> to disable the interface immediately.
         </column>
@@ -976,7 +976,7 @@
           successive attempts to rebalance the bond, that is, to move flows
           from one interface on the bond to another in an attempt to keep usage
           of each interface roughly equal.  If zero, load balancing is disabled
-          on the bond (carrier status changes still cause flows to move).  If
+          on the bond (link failure still cause flows to move).  If
           less than 1000ms, the rebalance interval will be 1000ms.
         </column>
       </group>