2 files changed, 59 insertions, 1 deletions

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index d5181ce9ff62..61f516b135b4 100644
--- 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 :
@@ -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
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 5dcc06721bba..554440af675c 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1086,6 +1086,24 @@ accept_dad - INTEGER
         2: Enable DAD, and disable IPv6 operation if MAC-based duplicate
            link-local address has been found.
 
+force_tllao - BOOLEAN
+        Enable sending the target link-layer address option even when
+        responding to a unicast neighbor solicitation.
+        Default: FALSE
+
+        Quoting from RFC 2461, section 4.4, Target link-layer address:
+
+        "The option MUST be included for multicast solicitations in order to
+        avoid infinite Neighbor Solicitation "recursion" when the peer node
+        does not have a cache entry to return a Neighbor Advertisements
+        message.  When responding to unicast solicitations, the option can be
+        omitted since the sender of the solicitation has the correct link-
+        layer address; otherwise it would not have be able to send the unicast
+        solicitation in the first place. However, including the link-layer
+        address in this case adds little overhead and eliminates a potential
+        race condition where the sender deletes the cached link-layer address
+        prior to receiving a response to a previous solicitation."
+
 icmp/*:
 ratelimit - INTEGER
         Limit the maximal rates for sending ICMPv6 packets.