bonding: start slaves with link down for ARP monitor

[karo-tx-linux.git] / drivers / net / bonding / bond_main.c

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 62d2409bb293c54de4173e8ef9452e35b6f172e2..44e6a64eecdd8cb97a6de6fddc0606de4f19419a 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1726,7 +1726,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
        read_lock(&bond->lock);
 
-       new_slave->last_arp_rx = jiffies;
+       new_slave->last_arp_rx = jiffies -
+               (msecs_to_jiffies(bond->params.arp_interval) + 1);
 
        if (bond->params.miimon && !bond->params.use_carrier) {
                link_reporting = bond_check_dev_link(bond, slave_dev, 1);
@@ -1751,22 +1752,30 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        }
 
        /* check for initial state */
-       if (!bond->params.miimon ||
-           (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
-               if (bond->params.updelay) {
-                       pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
-                       new_slave->link  = BOND_LINK_BACK;
-                       new_slave->delay = bond->params.updelay;
+       if (bond->params.miimon) {
+               if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {
+                       if (bond->params.updelay) {
+                               new_slave->link = BOND_LINK_BACK;
+                               new_slave->delay = bond->params.updelay;
+                       } else {
+                               new_slave->link = BOND_LINK_UP;
+                       }
                } else {
-                       pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
-                       new_slave->link  = BOND_LINK_UP;
+                       new_slave->link = BOND_LINK_DOWN;
                }
-               new_slave->jiffies = jiffies;
+       } else if (bond->params.arp_interval) {
+               new_slave->link = (netif_carrier_ok(slave_dev) ?
+                       BOND_LINK_UP : BOND_LINK_DOWN);
        } else {
-               pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
-               new_slave->link  = BOND_LINK_DOWN;
+               new_slave->link = BOND_LINK_UP;
        }
 
+       if (new_slave->link != BOND_LINK_DOWN)
+               new_slave->jiffies = jiffies;
+       pr_debug("Initial state of slave_dev is BOND_LINK_%s\n",
+               new_slave->link == BOND_LINK_DOWN ? "DOWN" :
+                       (new_slave->link == BOND_LINK_UP ? "UP" : "BACK"));
+
        bond_update_speed_duplex(new_slave);
 
        if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
@@ -4820,12 +4829,9 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
        return 0;
 }
 
-static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
-                             unsigned int *num_queues,
-                             unsigned int *real_num_queues)
+static int bond_get_tx_queues(struct net *net, struct nlattr *tb[])
 {
-       *num_queues = tx_queues;
-       return 0;
+       return tx_queues;
 }
 
 static struct rtnl_link_ops bond_link_ops __read_mostly = {