[ovs-dev] [PATCH] bond: Adjust bond hash masks

[Andy Zhou]

Commit 42781e77035d (bond: Unify hash functions in hash action and entry
lookup.) changed the BM_TCP's hash function, but did not update
hash mask fields accordingly.  Found by inspection.

CC: Ilya Maximets <i.maximets at samsung.com>
Signed-off-by: Andy Zhou <azhou at ovn.org>
---
 ofproto/bond.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ofproto/bond.c b/ofproto/bond.c
index e09136efbd98..7d8d6560c690 100644
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -1798,11 +1798,12 @@ choose_output_slave(const struct bond *bond, const struct flow *flow,
             return NULL;
         }
         if (wc) {
-            flow_mask_hash_fields(flow, wc, NX_HASH_FIELDS_SYMMETRIC_L4);
+            flow_mask_hash_fields(flow, wc,
+                                  NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP);
         }
         /* Fall Through. */
     case BM_SLB:
-        if (wc) {
+        if (wc && balance == BM_SLB) {
             flow_mask_hash_fields(flow, wc, NX_HASH_FIELDS_ETH_SRC);
         }
         e = lookup_bond_entry(bond, flow, vlan);
-- 
1.9.1