Merge "Hash parameters not reflected in route sometimes."

Juniper · Feb 1, 2016 · 76f64fb · 76f64fb
2 parents 552dad3 + df8c506
commit 76f64fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/vnsw/agent/controller/controller_peer.cc b/src/vnsw/agent/controller/controller_peer.cc
@@ -607,6 +607,7 @@ void AgentXmppChannel::ReceiveV4V6Update(XmlPugi *pugi) {
 
 static void GetEcmpHashFieldsToUse(ItemType *item,
                                    EcmpLoadBalance &ecmp_load_balance) {
+    ecmp_load_balance.ResetAll();
     if (item->entry.load_balance.load_balance_decision.empty() ||
         item->entry.load_balance.load_balance_decision !=
             LoadBalanceDecision)

diff --git a/src/vnsw/agent/oper/ecmp_load_balance.h b/src/vnsw/agent/oper/ecmp_load_balance.h
@@ -102,6 +102,14 @@ class EcmpLoadBalance {
         }
     }
 
+    void ResetAll() {
+        for (uint8_t field_type = ((uint8_t) EcmpLoadBalance::SOURCE_MAC);
+             field_type < ((uint8_t) EcmpLoadBalance::NUM_HASH_FIELDS);
+             field_type++) {
+            hash_fields_to_use_[field_type] = false;
+        }
+    }
+
     bool AllSet() const {
         for (uint8_t field_type = ((uint8_t) EcmpLoadBalance::SOURCE_MAC);
              field_type < ((uint8_t) EcmpLoadBalance::NUM_HASH_FIELDS);