bond: Always use L4 hash for stable bonds.

Stable bonds are used in such specialized cases that it doesn't
make sense to require LACP negotiations to use L4 hashing.

diff --git a/lib/bond.c b/lib/bond.c
index 9a688be6988bd1331bb44b84354e76a53675ffd7..85bb2da948c9d5c19bd91c045094beabf1c63129 100644 (file)
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -1305,8 +1305,8 @@ bond_link_status_update(struct bond_slave *slave, struct tag_set *tags)
 static bool
 bond_is_tcp_hash(const struct bond *bond)
 {
-    return (bond->balance == BM_TCP || bond->balance == BM_STABLE)
-        && bond->lacp_negotiated;
+    return (bond->balance == BM_TCP && bond->lacp_negotiated)
+        || bond->balance == BM_STABLE;
 }
 
 static unsigned int

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 85bf16277875514aaa45938912afb5776a783fe3..4288ee6b37f50715b1449a4d1526165534f975cf 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -536,8 +536,8 @@
           <p>Attempts to always assign a given flow to the same slave
             consistently.  In an effort to maintain stability, no load
             balancing is done.  Uses a similar hashing strategy to
-            <code>balance-tcp</code>, falling back to <code>balance-slb</code>
-            style hashing when LACP negotiations are unsuccessful.</p>
+            <code>balance-tcp</code>, always taking into account L3 and L4
+            fields even if LACP negotiations are unsuccessful. </p>
           <p>Slave selection decisions are made based on
             <code>bond-stable-id</code> if set.  Otherwise, OpenFlow port
             number is used.  Decisions are consistent across all ovs-vswitchd