1 files changed, 25 insertions, 5 deletions

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 6b1c7110534e..10a015c384b8 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -752,12 +752,22 @@ xmit_hash_policy
                 protocol information to generate the hash.
 
                 Uses XOR of hardware MAC addresses and IP addresses to
-                generate the hash.  The formula is
+                generate the hash.  The IPv4 formula is
 
                 (((source IP XOR dest IP) AND 0xffff) XOR
                         ( source MAC XOR destination MAC ))
                                 modulo slave count
 
+                The IPv6 formula is
+
+                hash = (source ip quad 2 XOR dest IP quad 2) XOR
+                       (source ip quad 3 XOR dest IP quad 3) XOR
+                       (source ip quad 4 XOR dest IP quad 4)
+
+                (((hash >> 24) XOR (hash >> 16) XOR (hash >> 8) XOR hash)
+                        XOR (source MAC XOR destination MAC))
+                                modulo slave count
+
                 This algorithm will place all traffic to a particular
                 network peer on the same slave.  For non-IP traffic,
                 the formula is the same as for the layer2 transmit
@@ -778,19 +788,29 @@ xmit_hash_policy
                 slaves, although a single connection will not span
                 multiple slaves.
 
-                The formula for unfragmented TCP and UDP packets is
+                The formula for unfragmented IPv4 TCP and UDP packets is
 
                 ((source port XOR dest port) XOR
                          ((source IP XOR dest IP) AND 0xffff)
                                 modulo slave count
 
-                For fragmented TCP or UDP packets and all other IP
-                protocol traffic, the source and destination port
+                The formula for unfragmented IPv6 TCP and UDP packets is
+
+                hash = (source port XOR dest port) XOR
+                       ((source ip quad 2 XOR dest IP quad 2) XOR
+                        (source ip quad 3 XOR dest IP quad 3) XOR
+                        (source ip quad 4 XOR dest IP quad 4))
+
+                ((hash >> 24) XOR (hash >> 16) XOR (hash >> 8) XOR hash)
+                        modulo slave count
+
+                For fragmented TCP or UDP packets and all other IPv4 and
+                IPv6 protocol traffic, the source and destination port
                 information is omitted.  For non-IP traffic, the
                 formula is the same as for the layer2 transmit hash
                 policy.
 
-                This policy is intended to mimic the behavior of
+                The IPv4 policy is intended to mimic the behavior of
                 certain switches, notably Cisco switches with PFC2 as
                 well as some Foundry and IBM products.