Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (35 commits)
  xen-netfront: rearrange netfront structure to separate tx and rx
  netdev: convert non-obvious instances to use ARRAY_SIZE()
  ucc_geth: Fix build break introduced by commit 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0
  gianfar: Fix regression caused by new napi interface
  gianfar: Cleanup compile warning caused by 0795af57
  gianfar: Fix compile regression caused by bea3348e
  add new prom.h for AU1x00
  update AU1000 get_ethernet_addr()
  MIPSsim: General cleanup
  Jazzsonic: Fix warning about unused variable.
  Remove msic_dcr_read() in axon_msi.c
  Use dcr_host_t.base in dcr_unmap()
  Add dcr_host_t.base in dcr_read()/dcr_write()
  Use dcr_host_t.base in ibm_emac_mal
  Update ibm_newemac to use dcr_host_t.base
  tehuti: possible leak in bdx_probe
  TC35815: Fix build
  SAA9730: Fix build
  AR7 ethernet
  myri10ge: update driver version to 1.3.2-1.287
  ...

1 files changed, 64 insertions, 10 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 6f49ca7e9b66..80c0c8c415ed 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -164,9 +164,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                 printk(KERN_INFO DRV_NAME
                                         ": %s is being deleted...\n",
                                         bond->dev->name);
-                                bond_deinit(bond->dev);
-                                bond_destroy_sysfs_entry(bond);
-                                unregister_netdevice(bond->dev);
+                                bond_destroy(bond);
                                 rtnl_unlock();
                                 goto out;
                         }
@@ -260,17 +258,16 @@ static ssize_t bonding_store_slaves(struct device *d,
         char command[IFNAMSIZ + 1] = { 0, };
         char *ifname;
         int i, res, found, ret = count;
+        u32 original_mtu;
         struct slave *slave;
         struct net_device *dev = NULL;
         struct bonding *bond = to_bond(d);
 
         /* Quick sanity check -- is the bond interface up? */
         if (!(bond->dev->flags & IFF_UP)) {
-                printk(KERN_ERR DRV_NAME
-                       ": %s: Unable to update slaves because interface is down.\n",
+                printk(KERN_WARNING DRV_NAME
+                       ": %s: doing slave updates when interface is down.\n",
                        bond->dev->name);
-                ret = -EPERM;
-                goto out;
         }
 
         /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
@@ -327,6 +324,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 }
 
                 /* Set the slave's MTU to match the bond */
+                original_mtu = dev->mtu;
                 if (dev->mtu != bond->dev->mtu) {
                         if (dev->change_mtu) {
                                 res = dev->change_mtu(dev,
@@ -341,6 +339,9 @@ static ssize_t bonding_store_slaves(struct device *d,
                 }
                 rtnl_lock();
                 res = bond_enslave(bond->dev, dev);
+                bond_for_each_slave(bond, slave, i)
+                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
+                                slave->original_mtu = original_mtu;
                 rtnl_unlock();
                 if (res) {
                         ret = res;
@@ -353,13 +354,17 @@ static ssize_t bonding_store_slaves(struct device *d,
                 bond_for_each_slave(bond, slave, i)
                         if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
                                 dev = slave->dev;
+                                original_mtu = slave->original_mtu;
                                 break;
                         }
                 if (dev) {
                         printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                         rtnl_lock();
-                        res = bond_release(bond->dev, dev);
+                        if (bond->setup_by_slave)
+                                res = bond_release_and_destroy(bond->dev, dev);
+                        else
+                                res = bond_release(bond->dev, dev);
                         rtnl_unlock();
                         if (res) {
                                 ret = res;
@@ -367,9 +372,9 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
                         /* set the slave MTU to the default */
                         if (dev->change_mtu) {
-                                dev->change_mtu(dev, 1500);
+                                dev->change_mtu(dev, original_mtu);
                         } else {
-                                dev->mtu = 1500;
+                                dev->mtu = original_mtu;
                         }
                 }
                 else {
@@ -563,6 +568,54 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 static DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_validate, bonding_store_arp_validate);
 
 /*
+ * Show and store fail_over_mac.  User only allowed to change the
+ * value when there are no slaves.
+ */
+static ssize_t bonding_show_fail_over_mac(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct bonding *bond = to_bond(d);
+
+        return sprintf(buf, "%d\n", bond->params.fail_over_mac) + 1;
+}
+
+static ssize_t bonding_store_fail_over_mac(struct device *d, struct device_attribute *attr, const char *buf, size_t count)
+{
+        int new_value;
+        int ret = count;
+        struct bonding *bond = to_bond(d);
+
+        if (bond->slave_cnt != 0) {
+                printk(KERN_ERR DRV_NAME
+                       ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+                       bond->dev->name);
+                ret = -EPERM;
+                goto out;
+        }
+
+        if (sscanf(buf, "%d", &new_value) != 1) {
+                printk(KERN_ERR DRV_NAME
+                       ": %s: no fail_over_mac value specified.\n",
+                       bond->dev->name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if ((new_value == 0) || (new_value == 1)) {
+                bond->params.fail_over_mac = new_value;
+                printk(KERN_INFO DRV_NAME ": %s: Setting fail_over_mac to %d.\n",
+                       bond->dev->name, new_value);
+        } else {
+                printk(KERN_INFO DRV_NAME
+                       ": %s: Ignoring invalid fail_over_mac value %d.\n",
+                       bond->dev->name, new_value);
+        }
+out:
+        return ret;
+}
+
+static DEVICE_ATTR(fail_over_mac, S_IRUGO | S_IWUSR, bonding_show_fail_over_mac, bonding_store_fail_over_mac);
+
+/*
  * Show and set the arp timer interval.  There are two tricky bits
  * here.  First, if ARP monitoring is activated, then we must disable
  * MII monitoring.  Second, if the ARP timer isn't running, we must
@@ -1383,6 +1436,7 @@ static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 static struct attribute *per_bond_attrs[] = {
         &dev_attr_slaves.attr,
         &dev_attr_mode.attr,
+        &dev_attr_fail_over_mac.attr,
         &dev_attr_arp_validate.attr,
         &dev_attr_arp_interval.attr,
         &dev_attr_arp_ip_target.attr,