Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[cascardo/linux.git] / Documentation / networking / bonding.txt

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 0876275..61f516b 100644 (file)
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1,7 +1,7 @@
 
                Linux Ethernet Bonding Driver HOWTO
 
-               Latest update: 12 November 2007
+               Latest update: 23 September 2009
 
 Initial release : Thomas Davis <tadavis at lbl.gov>
 Corrections, HA extensions : 2000/10/03-15 :
@@ -221,7 +221,7 @@ ad_select
 
                - Any slave's 802.3ad association state changes
 
-               - The bond's adminstrative state changes to up
+               - The bond's administrative state changes to up
 
        count or 2
 
@@ -369,7 +369,7 @@ fail_over_mac
                When this policy is used in conjuction with the mii
                monitor, devices which assert link up prior to being
                able to actually transmit and receive are particularly
-               susecptible to loss of the gratuitous ARP, and an
+               susceptible to loss of the gratuitous ARP, and an
                appropriate updelay setting may be required.
 
        follow or 2
@@ -614,6 +614,46 @@ primary
 
        The primary option is only valid for active-backup mode.
 
+primary_reselect
+
+       Specifies the reselection policy for the primary slave.  This
+       affects how the primary slave is chosen to become the active slave
+       when failure of the active slave or recovery of the primary slave
+       occurs.  This option is designed to prevent flip-flopping between
+       the primary slave and other slaves.  Possible values are:
+
+       always or 0 (default)
+
+               The primary slave becomes the active slave whenever it
+               comes back up.
+
+       better or 1
+
+               The primary slave becomes the active slave when it comes
+               back up, if the speed and duplex of the primary slave is
+               better than the speed and duplex of the current active
+               slave.
+
+       failure or 2
+
+               The primary slave becomes the active slave only if the
+               current active slave fails and the primary slave is up.
+
+       The primary_reselect setting is ignored in two cases:
+
+               If no slaves are active, the first slave to recover is
+               made the active slave.
+
+               When initially enslaved, the primary slave is always made
+               the active slave.
+
+       Changing the primary_reselect policy via sysfs will cause an
+       immediate selection of the best active slave according to the new
+       policy.  This may or may not result in a change of the active
+       slave, depending upon the circumstances.
+
+       This option was added for bonding version 3.6.0.
+
 updelay
 
        Specifies the time, in milliseconds, to wait before enabling a
@@ -1794,7 +1834,7 @@ target to query.
 generally referred to as "trunk failover."  This is a feature of the
 switch that causes the link state of a particular switch port to be set
 down (or up) when the state of another switch port goes down (or up).
-It's purpose is to propogate link failures from logically "exterior" ports
+Its purpose is to propagate link failures from logically "exterior" ports
 to the logically "interior" ports that bonding is able to monitor via
 miimon.  Availability and configuration for trunk failover varies by
 switch, but this can be a viable alternative to the ARP monitor when using