GIT: unionfs2-2.6.27.y: bonding: ignore updelay param when there is no active slave

[Erez Zadok]

commit 9776e39de376c2dd759f1d8d7f568111139b330e
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Fri Apr 24 03:57:29 2009 +0000

    bonding: ignore updelay param when there is no active slave
    
    commit 41f8910040639eb106b1a5b5301aab79ecde4940 upstream.
    
    Pointed out by Sean E. Millichamp.
    
    Quote from Documentation/networking/bonding.txt:
    "Note that when a bonding interface has no active links, the
    driver will immediately reuse the first link that goes up, even if the
    updelay parameter has been specified (the updelay is ignored in this
    case).  If there are slave interfaces waiting for the updelay timeout
    to expire, the interface that first went into that state will be
    immediately reused.  This reduces down time of the network if the
    value of updelay has been overestimated, and since this occurs only in
    cases with no connectivity, there is no additional penalty for
    ignoring the updelay."
    
    This patch actually changes the behaviour in this way.
    
    Signed-off-by: Jiri Pirko <jpirko at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Cc: Jean Delvare <jdelvare at suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5a07b50..598d2e9 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2228,6 +2228,9 @@ static int bond_miimon_inspect(struct bonding *bond)
 {
 	struct slave *slave;
 	int i, link_state, commit = 0;
+	bool ignore_updelay;
+
+	ignore_updelay = !bond->curr_active_slave ? true : false;
 
 	bond_for_each_slave(bond, slave, i) {
 		slave->new_link = BOND_LINK_NOCHANGE;
@@ -2292,6 +2295,7 @@ static int bond_miimon_inspect(struct bonding *bond)
 				       ": %s: link status up for "
 				       "interface %s, enabling it in %d ms.\n",
 				       bond->dev->name, slave->dev->name,
+				       ignore_updelay ? 0 :
 				       bond->params.updelay *
 				       bond->params.miimon);
 			}
@@ -2310,9 +2314,13 @@ static int bond_miimon_inspect(struct bonding *bond)
 				continue;
 			}
 
+			if (ignore_updelay)
+				slave->delay = 0;
+
 			if (slave->delay <= 0) {
 				slave->new_link = BOND_LINK_UP;
 				commit++;
+				ignore_updelay = false;
 				continue;
 			}