From: Andy Zhou <azhou@nicira.com>
Date: Wed, 16 Apr 2014 14:51:02 +0000 (-0700)
Subject: ofproto/bond: Keep hash entry slave valid.
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~128
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=545b23f61fe72e77b37933e5b5fe3f6c4f4a9230

ofproto/bond: Keep hash entry slave valid.

Bond recirculation needs to refresh the 'hidden rules' from
time to time. Keep hash entry slave valid to prevent those
hidden rules from being removed.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
---

diff --git a/ofproto/bond.c b/ofproto/bond.c
index c0f79c992..b1b8997f3 100644
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -1179,9 +1179,6 @@ bond_rebalance(struct bond *bond)
      * take 20 rebalancing runs to decay to 0 and get deleted entirely. */
     for (e = &bond->hash[0]; e <= &bond->hash[BOND_MASK]; e++) {
         e->tx_bytes /= 2;
-        if (!e->tx_bytes) {
-            e->slave = NULL;
-        }
     }
 
 done: