bonding: documentation and code cleanup for resend_igmp
[linux-2.6.git] / drivers / net / bonding / bond_sysfs.c
index a771853..88fcb25 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
  * Copyright(c) 2004-2005 Intel Corporation. All rights reserved.
  *
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/sched.h>
 #include <linux/sysdev.h>
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/ctype.h>
 #include <linux/inet.h>
 #include <linux/rtnetlink.h>
+#include <linux/etherdevice.h>
 #include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <linux/nsproxy.h>
 
-/* #define BONDING_DEBUG 1 */
 #include "bonding.h"
-#define to_dev(obj)    container_of(obj,struct device,kobj)
-#define to_bond(cd)    ((struct bonding *)(to_net_dev(cd)->priv))
-
-/*---------------------------- Declarations -------------------------------*/
-
-
-extern struct list_head bond_dev_list;
-extern struct bond_params bonding_defaults;
-extern struct bond_parm_tbl bond_mode_tbl[];
-extern struct bond_parm_tbl bond_lacp_tbl[];
-extern struct bond_parm_tbl xmit_hashtype_tbl[];
-extern struct bond_parm_tbl arp_validate_tbl[];
-
-static int expected_refcount = -1;
-static struct class *netdev_class;
-/*--------------------------- Data Structures -----------------------------*/
-
-/* Bonding sysfs lock.  Why can't we just use the subsytem lock?
- * Because kobject_register tries to acquire the subsystem lock.  If
- * we already hold the lock (which we would if the user was creating
- * a new bond through the sysfs interface), we deadlock.
- * This lock is only needed when deleting a bond - we need to make sure
- * that we don't collide with an ongoing ioctl.
- */
-
-struct rw_semaphore bonding_rwsem;
-
-
 
-
-/*------------------------------ Functions --------------------------------*/
+#define to_dev(obj)    container_of(obj, struct device, kobj)
+#define to_bond(cd)    ((struct bonding *)(netdev_priv(to_net_dev(cd))))
 
 /*
  * "show" function for the bond_masters attribute.
  * The class parameter is ignored.
  */
-static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
+static ssize_t bonding_show_bonds(struct class *cls,
+                                 struct class_attribute *attr,
+                                 char *buf)
 {
+       struct net *net = current->nsproxy->net_ns;
+       struct bond_net *bn = net_generic(net, bond_net_id);
        int res = 0;
        struct bonding *bond;
 
-       down_read(&(bonding_rwsem));
+       rtnl_lock();
 
-       list_for_each_entry(bond, &bond_dev_list, bond_list) {
+       list_for_each_entry(bond, &bn->dev_list, bond_list) {
                if (res > (PAGE_SIZE - IFNAMSIZ)) {
                        /* not enough space for another interface name */
                        if ((PAGE_SIZE - res) > 10)
                                res = PAGE_SIZE - 10;
-                       res += sprintf(buffer + res, "++more++");
+                       res += sprintf(buf + res, "++more++ ");
                        break;
                }
-               res += sprintf(buffer + res, "%s ",
-                              bond->dev->name);
+               res += sprintf(buf + res, "%s ", bond->dev->name);
        }
-       res += sprintf(buffer + res, "\n");
-       res++;
-       up_read(&(bonding_rwsem));
+       if (res)
+               buf[res-1] = '\n'; /* eat the leftover space */
+
+       rtnl_unlock();
        return res;
 }
 
+static struct net_device *bond_get_by_name(struct net *net, const char *ifname)
+{
+       struct bond_net *bn = net_generic(net, bond_net_id);
+       struct bonding *bond;
+
+       list_for_each_entry(bond, &bn->dev_list, bond_list) {
+               if (strncmp(bond->dev->name, ifname, IFNAMSIZ) == 0)
+                       return bond->dev;
+       }
+       return NULL;
+}
+
 /*
  * "store" function for the bond_masters attribute.  This is what
  * creates and deletes entire bonds.
@@ -106,15 +99,15 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
  *
  */
 
-static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t count)
+static ssize_t bonding_store_bonds(struct class *cls,
+                                  struct class_attribute *attr,
+                                  const char *buffer, size_t count)
 {
+       struct net *net = current->nsproxy->net_ns;
        char command[IFNAMSIZ + 1] = {0, };
        char *ifname;
-       int res = count;
-       struct bonding *bond;
-       struct bonding *nxt;
+       int rv, res = count;
 
-       down_write(&(bonding_rwsem));
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
        if ((strlen(command) <= 1) ||
@@ -122,78 +115,47 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                goto err_no_cmd;
 
        if (command[0] == '+') {
-
-               /* Check to see if the bond already exists. */
-               list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
-                       if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                               printk(KERN_ERR DRV_NAME
-                                       ": cannot add bond %s; it already exists\n",
-                                       ifname);
-                               res = -EPERM;
-                               goto out;
-                       }
-
-               printk(KERN_INFO DRV_NAME
-                       ": %s is being created...\n", ifname);
-               if (bond_create(ifname, &bonding_defaults, &bond)) {
-                       printk(KERN_INFO DRV_NAME
-                       ": %s interface already exists. Bond creation failed.\n",
-                       ifname);
-                       res = -EPERM;
+               pr_info("%s is being created...\n", ifname);
+               rv = bond_create(net, ifname);
+               if (rv) {
+                       if (rv == -EEXIST)
+                               pr_info("%s already exists.\n", ifname);
+                       else
+                               pr_info("%s creation failed.\n", ifname);
+                       res = rv;
                }
-               goto out;
-       }
+       } else if (command[0] == '-') {
+               struct net_device *bond_dev;
 
-       if (command[0] == '-') {
-               list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
-                       if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                               rtnl_lock();
-                               /* check the ref count on the bond's kobject.
-                                * If it's > expected, then there's a file open,
-                                * and we have to fail.
-                                */
-                               if (atomic_read(&bond->dev->dev.kobj.kref.refcount)
-                                                       > expected_refcount){
-                                       rtnl_unlock();
-                                       printk(KERN_INFO DRV_NAME
-                                               ": Unable remove bond %s due to open references.\n",
-                                               ifname);
-                                       res = -EPERM;
-                                       goto out;
-                               }
-                               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);
-                               rtnl_unlock();
-                               goto out;
-                       }
-
-               printk(KERN_ERR DRV_NAME
-                       ": unable to delete non-existent bond %s\n", ifname);
-               res = -ENODEV;
-               goto out;
-       }
-
-err_no_cmd:
-       printk(KERN_ERR DRV_NAME
-               ": no command found in bonding_masters. Use +ifname or -ifname.\n");
-       res = -EPERM;
+               rtnl_lock();
+               bond_dev = bond_get_by_name(net, ifname);
+               if (bond_dev) {
+                       pr_info("%s is being deleted...\n", ifname);
+                       unregister_netdevice(bond_dev);
+               } else {
+                       pr_err("unable to delete non-existent %s\n", ifname);
+                       res = -ENODEV;
+               }
+               rtnl_unlock();
+       } else
+               goto err_no_cmd;
 
        /* Always return either count or an error.  If you return 0, you'll
         * get called forever, which is bad.
         */
-out:
-       up_write(&(bonding_rwsem));
        return res;
+
+err_no_cmd:
+       pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
+       return -EPERM;
 }
+
 /* class attribute for bond_masters file.  This ends up in /sys/class/net */
 static CLASS_ATTR(bonding_masters,  S_IWUSR | S_IRUGO,
                  bonding_show_bonds, bonding_store_bonds);
 
-int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave)
+int bond_create_slave_symlinks(struct net_device *master,
+                              struct net_device *slave)
 {
        char linkname[IFNAMSIZ+7];
        int ret = 0;
@@ -204,19 +166,20 @@ int bond_create_slave_symlinks(struct net_device *master, struct net_device *sla
        if (ret)
                return ret;
        /* next, create a link from the master to the slave */
-       sprintf(linkname,"slave_%s",slave->name);
+       sprintf(linkname, "slave_%s", slave->name);
        ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
                                linkname);
        return ret;
 
 }
 
-void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave)
+void bond_destroy_slave_symlinks(struct net_device *master,
+                                struct net_device *slave)
 {
        char linkname[IFNAMSIZ+7];
 
        sysfs_remove_link(&(slave->dev.kobj), "master");
-       sprintf(linkname,"slave_%s",slave->name);
+       sprintf(linkname, "slave_%s", slave->name);
        sysfs_remove_link(&(master->dev.kobj), linkname);
 }
 
@@ -231,27 +194,28 @@ static ssize_t bonding_show_slaves(struct device *d,
        int i, res = 0;
        struct bonding *bond = to_bond(d);
 
-       read_lock_bh(&bond->lock);
+       read_lock(&bond->lock);
        bond_for_each_slave(bond, slave, i) {
                if (res > (PAGE_SIZE - IFNAMSIZ)) {
                        /* not enough space for another interface name */
                        if ((PAGE_SIZE - res) > 10)
                                res = PAGE_SIZE - 10;
-                       res += sprintf(buf + res, "++more++");
+                       res += sprintf(buf + res, "++more++ ");
                        break;
                }
                res += sprintf(buf + res, "%s ", slave->dev->name);
        }
-       read_unlock_bh(&bond->lock);
-       res += sprintf(buf + res, "\n");
-       res++;
+       read_unlock(&bond->lock);
+       if (res)
+               buf[res-1] = '\n'; /* eat the leftover space */
        return res;
 }
 
 /*
  * Set the slaves in the current bond.  The bond interface must be
  * up for this to succeed.
- * This function is largely the same flow as bonding_update_bonds().
+ * This is supposed to be only thin wrapper for bond_enslave and bond_release.
+ * All hard work should be done there.
  */
 static ssize_t bonding_store_slaves(struct device *d,
                                    struct device_attribute *attr,
@@ -259,21 +223,12 @@ static ssize_t bonding_store_slaves(struct device *d,
 {
        char command[IFNAMSIZ + 1] = { 0, };
        char *ifname;
-       int i, res, found, ret = count;
-       struct slave *slave;
-       struct net_device *dev = NULL;
+       int res, ret = count;
+       struct net_device *dev;
        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",
-                      bond->dev->name);
-               ret = -EPERM;
-               goto out;
-       }
-
-       /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
+       if (!rtnl_trylock())
+               return restart_syscall();
 
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
@@ -281,114 +236,45 @@ static ssize_t bonding_store_slaves(struct device *d,
            !dev_valid_name(ifname))
                goto err_no_cmd;
 
-       if (command[0] == '+') {
+       dev = __dev_get_by_name(dev_net(bond->dev), ifname);
+       if (!dev) {
+               pr_info("%s: Interface %s does not exist!\n",
+                       bond->dev->name, ifname);
+               ret = -ENODEV;
+               goto out;
+       }
 
-               /* Got a slave name in ifname.  Is it already in the list? */
-               found = 0;
-               read_lock_bh(&bond->lock);
-               bond_for_each_slave(bond, slave, i)
-                       if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                               printk(KERN_ERR DRV_NAME
-                                      ": %s: Interface %s is already enslaved!\n",
-                                      bond->dev->name, ifname);
-                               ret = -EPERM;
-                               read_unlock_bh(&bond->lock);
-                               goto out;
-                       }
+       switch (command[0]) {
+       case '+':
+               pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
+               res = bond_enslave(bond->dev, dev);
+               break;
 
-               read_unlock_bh(&bond->lock);
-               printk(KERN_INFO DRV_NAME ": %s: Adding slave %s.\n",
-                      bond->dev->name, ifname);
-               dev = dev_get_by_name(&init_net, ifname);
-               if (!dev) {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: Interface %s does not exist!\n",
-                              bond->dev->name, ifname);
-                       ret = -EPERM;
-                       goto out;
-               }
-               else
-                       dev_put(dev);
-
-               if (dev->flags & IFF_UP) {
-                       printk(KERN_ERR DRV_NAME
-                              ": %s: Error: Unable to enslave %s "
-                              "because it is already up.\n",
-                              bond->dev->name, dev->name);
-                       ret = -EPERM;
-                       goto out;
-               }
-               /* If this is the first slave, then we need to set
-                  the master's hardware address to be the same as the
-                  slave's. */
-               if (!(*((u32 *) & (bond->dev->dev_addr[0])))) {
-                       memcpy(bond->dev->dev_addr, dev->dev_addr,
-                              dev->addr_len);
-               }
+       case '-':
+               pr_info("%s: Removing slave %s.\n", bond->dev->name, dev->name);
+               res = bond_release(bond->dev, dev);
+               break;
 
-               /* Set the slave's MTU to match the bond */
-               if (dev->mtu != bond->dev->mtu) {
-                       if (dev->change_mtu) {
-                               res = dev->change_mtu(dev,
-                                                     bond->dev->mtu);
-                               if (res) {
-                                       ret = res;
-                                       goto out;
-                               }
-                       } else {
-                               dev->mtu = bond->dev->mtu;
-                       }
-               }
-               rtnl_lock();
-               res = bond_enslave(bond->dev, dev);
-               rtnl_unlock();
-               if (res) {
-                       ret = res;
-               }
-               goto out;
+       default:
+               goto err_no_cmd;
        }
 
-       if (command[0] == '-') {
-               dev = NULL;
-               bond_for_each_slave(bond, slave, i)
-                       if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                               dev = slave->dev;
-                               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);
-                       rtnl_unlock();
-                       if (res) {
-                               ret = res;
-                               goto out;
-                       }
-                       /* set the slave MTU to the default */
-                       if (dev->change_mtu) {
-                               dev->change_mtu(dev, 1500);
-                       } else {
-                               dev->mtu = 1500;
-                       }
-               }
-               else {
-                       printk(KERN_ERR DRV_NAME ": unable to remove non-existent slave %s for bond %s.\n",
-                               ifname, bond->dev->name);
-                       ret = -ENODEV;
-               }
-               goto out;
-       }
+       if (res)
+               ret = res;
+       goto out;
 
 err_no_cmd:
-       printk(KERN_ERR DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+       pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
+              bond->dev->name);
        ret = -EPERM;
 
 out:
+       rtnl_unlock();
        return ret;
 }
 
-static DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves, bonding_store_slaves);
+static DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves,
+                  bonding_store_slaves);
 
 /*
  * Show and set the bonding mode.  The bond interface must be down to
@@ -401,7 +287,7 @@ static ssize_t bonding_show_mode(struct device *d,
 
        return sprintf(buf, "%s %d\n",
                        bond_mode_tbl[bond->params.mode].modename,
-                       bond->params.mode) + 1;
+                       bond->params.mode);
 }
 
 static ssize_t bonding_store_mode(struct device *d,
@@ -412,60 +298,52 @@ static ssize_t bonding_store_mode(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               printk(KERN_ERR DRV_NAME
-                      ": unable to update mode of %s because interface is up.\n",
+               pr_err("unable to update mode of %s because interface is up.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
-       new_value = bond_parse_parm((char *)buf, bond_mode_tbl);
+       new_value = bond_parse_parm(buf, bond_mode_tbl);
        if (new_value < 0)  {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Ignoring invalid mode value %.*s.\n",
-                      bond->dev->name,
-                      (int)strlen(buf) - 1, buf);
+               pr_err("%s: Ignoring invalid mode value %.*s.\n",
+                      bond->dev->name, (int)strlen(buf) - 1, buf);
+               ret = -EINVAL;
+               goto out;
+       }
+       if ((new_value == BOND_MODE_ALB ||
+            new_value == BOND_MODE_TLB) &&
+           bond->params.arp_interval) {
+               pr_err("%s: %s mode is incompatible with arp monitoring.\n",
+                      bond->dev->name, bond_mode_tbl[new_value].modename);
                ret = -EINVAL;
                goto out;
-       } else {
-               if (bond->params.mode == BOND_MODE_8023AD)
-                       bond_unset_master_3ad_flags(bond);
-
-               if (bond->params.mode == BOND_MODE_ALB)
-                       bond_unset_master_alb_flags(bond);
-
-               bond->params.mode = new_value;
-               bond_set_mode_ops(bond, bond->params.mode);
-               printk(KERN_INFO DRV_NAME ": %s: setting mode to %s (%d).\n",
-                       bond->dev->name, bond_mode_tbl[new_value].modename, new_value);
        }
+
+       bond->params.mode = new_value;
+       bond_set_mode_ops(bond, bond->params.mode);
+       pr_info("%s: setting mode to %s (%d).\n",
+               bond->dev->name, bond_mode_tbl[new_value].modename,
+               new_value);
 out:
        return ret;
 }
-static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, bonding_show_mode, bonding_store_mode);
+static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                  bonding_show_mode, bonding_store_mode);
 
 /*
- * Show and set the bonding transmit hash method.  The bond interface must be down to
- * change the xmit hash policy.
+ * Show and set the bonding transmit hash method.
+ * The bond interface must be down to change the xmit hash policy.
  */
 static ssize_t bonding_show_xmit_hash(struct device *d,
                                      struct device_attribute *attr,
                                      char *buf)
 {
-       int count;
        struct bonding *bond = to_bond(d);
 
-       if ((bond->params.mode != BOND_MODE_XOR) &&
-           (bond->params.mode != BOND_MODE_8023AD)) {
-               // Not Applicable
-               count = sprintf(buf, "NA\n") + 1;
-       } else {
-               count = sprintf(buf, "%s %d\n",
-                       xmit_hashtype_tbl[bond->params.xmit_policy].modename,
-                       bond->params.xmit_policy) + 1;
-       }
-
-       return count;
+       return sprintf(buf, "%s %d\n",
+                      xmit_hashtype_tbl[bond->params.xmit_policy].modename,
+                      bond->params.xmit_policy);
 }
 
 static ssize_t bonding_store_xmit_hash(struct device *d,
@@ -476,26 +354,15 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               printk(KERN_ERR DRV_NAME
-                      "%s: Interface is up. Unable to update xmit policy.\n",
-                      bond->dev->name);
-               ret = -EPERM;
-               goto out;
-       }
-
-       if ((bond->params.mode != BOND_MODE_XOR) &&
-           (bond->params.mode != BOND_MODE_8023AD)) {
-               printk(KERN_ERR DRV_NAME
-                      "%s: Transmit hash policy is irrelevant in this mode.\n",
+               pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
-       new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);
+       new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
        if (new_value < 0)  {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+               pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
                       bond->dev->name,
                       (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
@@ -503,13 +370,15 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
        } else {
                bond->params.xmit_policy = new_value;
                bond_set_mode_ops(bond, bond->params.mode);
-               printk(KERN_INFO DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
-                       bond->dev->name, xmit_hashtype_tbl[new_value].modename, new_value);
+               pr_info("%s: setting xmit hash policy to %s (%d).\n",
+                       bond->dev->name,
+                       xmit_hashtype_tbl[new_value].modename, new_value);
        }
 out:
        return ret;
 }
-static DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR, bonding_show_xmit_hash, bonding_store_xmit_hash);
+static DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR,
+                  bonding_show_xmit_hash, bonding_store_xmit_hash);
 
 /*
  * Show and set arp_validate.
@@ -522,7 +391,7 @@ static ssize_t bonding_show_arp_validate(struct device *d,
 
        return sprintf(buf, "%s %d\n",
                       arp_validate_tbl[bond->params.arp_validate].modename,
-                      bond->params.arp_validate) + 1;
+                      bond->params.arp_validate);
 }
 
 static ssize_t bonding_store_arp_validate(struct device *d,
@@ -532,35 +401,74 @@ static ssize_t bonding_store_arp_validate(struct device *d,
        int new_value;
        struct bonding *bond = to_bond(d);
 
-       new_value = bond_parse_parm((char *)buf, arp_validate_tbl);
+       new_value = bond_parse_parm(buf, arp_validate_tbl);
        if (new_value < 0) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Ignoring invalid arp_validate value %s\n",
+               pr_err("%s: Ignoring invalid arp_validate value %s\n",
                       bond->dev->name, buf);
                return -EINVAL;
        }
        if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: arp_validate only supported in active-backup mode.\n",
+               pr_err("%s: arp_validate only supported in active-backup mode.\n",
                       bond->dev->name);
                return -EINVAL;
        }
-       printk(KERN_INFO DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
-              bond->dev->name, arp_validate_tbl[new_value].modename,
-              new_value);
-
-       if (!bond->params.arp_validate && new_value) {
-               bond_register_arp(bond);
-       } else if (bond->params.arp_validate && !new_value) {
-               bond_unregister_arp(bond);
-       }
+       pr_info("%s: setting arp_validate to %s (%d).\n",
+               bond->dev->name, arp_validate_tbl[new_value].modename,
+               new_value);
 
        bond->params.arp_validate = new_value;
 
        return count;
 }
 
-static DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_validate, bonding_store_arp_validate);
+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, "%s %d\n",
+                      fail_over_mac_tbl[bond->params.fail_over_mac].modename,
+                      bond->params.fail_over_mac);
+}
+
+static ssize_t bonding_store_fail_over_mac(struct device *d,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
+{
+       int new_value;
+       struct bonding *bond = to_bond(d);
+
+       if (bond->slave_cnt != 0) {
+               pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
+                      bond->dev->name);
+               return -EPERM;
+       }
+
+       new_value = bond_parse_parm(buf, fail_over_mac_tbl);
+       if (new_value < 0) {
+               pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
+                      bond->dev->name, buf);
+               return -EINVAL;
+       }
+
+       bond->params.fail_over_mac = new_value;
+       pr_info("%s: Setting fail_over_mac to %s (%d).\n",
+               bond->dev->name, fail_over_mac_tbl[new_value].modename,
+               new_value);
+
+       return count;
+}
+
+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
@@ -574,7 +482,7 @@ static ssize_t bonding_show_arp_interval(struct device *d,
 {
        struct bonding *bond = to_bond(d);
 
-       return sprintf(buf, "%d\n", bond->params.arp_interval) + 1;
+       return sprintf(buf, "%d\n", bond->params.arp_interval);
 }
 
 static ssize_t bonding_store_arp_interval(struct device *d,
@@ -585,43 +493,39 @@ static ssize_t bonding_store_arp_interval(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: no arp_interval value specified.\n",
+               pr_err("%s: no arp_interval value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+               pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                       bond->dev->name, new_value, INT_MAX);
                ret = -EINVAL;
                goto out;
        }
-
-       printk(KERN_INFO DRV_NAME
-              ": %s: Setting ARP monitoring interval to %d.\n",
-              bond->dev->name, new_value);
+       if (bond->params.mode == BOND_MODE_ALB ||
+           bond->params.mode == BOND_MODE_TLB) {
+               pr_info("%s: ARP monitoring cannot be used with ALB/TLB. Only MII monitoring is supported on %s.\n",
+                       bond->dev->name, bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       pr_info("%s: Setting ARP monitoring interval to %d.\n",
+               bond->dev->name, new_value);
        bond->params.arp_interval = new_value;
        if (bond->params.miimon) {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: ARP monitoring cannot be used with MII monitoring. "
-                      "%s Disabling MII monitoring.\n",
-                      bond->dev->name, bond->dev->name);
+               pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
+                       bond->dev->name, bond->dev->name);
                bond->params.miimon = 0;
-               /* Kill MII timer, else it brings bond's link down */
-               if (bond->arp_timer.function) {
-                       printk(KERN_INFO DRV_NAME
-                       ": %s: Kill MII timer, else it brings bond's link down...\n",
-                      bond->dev->name);
-                       del_timer_sync(&bond->mii_timer);
+               if (delayed_work_pending(&bond->mii_work)) {
+                       cancel_delayed_work(&bond->mii_work);
+                       flush_workqueue(bond->wq);
                }
        }
        if (!bond->params.arp_targets[0]) {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: ARP monitoring has been set up, "
-                      "but no ARP targets have been specified.\n",
-                      bond->dev->name);
+               pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
+                       bond->dev->name);
        }
        if (bond->dev->flags & IFF_UP) {
                /* If the interface is up, we may need to fire off
@@ -629,32 +533,23 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 * timer will get fired off when the open function
                 * is called.
                 */
-               if (bond->arp_timer.function) {
-                       /* The timer's already set up, so fire it off */
-                       mod_timer(&bond->arp_timer, jiffies + 1);
-               } else {
-                       /* Set up the timer. */
-                       init_timer(&bond->arp_timer);
-                       bond->arp_timer.expires = jiffies + 1;
-                       bond->arp_timer.data =
-                               (unsigned long) bond->dev;
-                       if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) {
-                               bond->arp_timer.function =
-                                       (void *)
-                                       &bond_activebackup_arp_mon;
-                       } else {
-                               bond->arp_timer.function =
-                                       (void *)
-                                       &bond_loadbalance_arp_mon;
-                       }
-                       add_timer(&bond->arp_timer);
+               if (!delayed_work_pending(&bond->arp_work)) {
+                       if (bond->params.mode == BOND_MODE_ACTIVEBACKUP)
+                               INIT_DELAYED_WORK(&bond->arp_work,
+                                                 bond_activebackup_arp_mon);
+                       else
+                               INIT_DELAYED_WORK(&bond->arp_work,
+                                                 bond_loadbalance_arp_mon);
+
+                       queue_delayed_work(bond->wq, &bond->arp_work, 0);
                }
        }
 
 out:
        return ret;
 }
-static DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR , bonding_show_arp_interval, bonding_store_arp_interval);
+static DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR,
+                  bonding_show_arp_interval, bonding_store_arp_interval);
 
 /*
  * Show and set the arp targets.
@@ -668,13 +563,11 @@ static ssize_t bonding_show_arp_targets(struct device *d,
 
        for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
                if (bond->params.arp_targets[i])
-                       res += sprintf(buf + res, "%u.%u.%u.%u ",
-                              NIPQUAD(bond->params.arp_targets[i]));
+                       res += sprintf(buf + res, "%pI4 ",
+                                      &bond->params.arp_targets[i]);
        }
        if (res)
-               res--;  /* eat the leftover space */
-       res += sprintf(buf + res, "\n");
-       res++;
+               buf[res-1] = '\n'; /* eat the leftover space */
        return res;
 }
 
@@ -682,79 +575,72 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                                         struct device_attribute *attr,
                                         const char *buf, size_t count)
 {
-       u32 newtarget;
+       __be32 newtarget;
        int i = 0, done = 0, ret = count;
        struct bonding *bond = to_bond(d);
-       u32 *targets;
+       __be32 *targets;
 
        targets = bond->params.arp_targets;
        newtarget = in_aton(buf + 1);
        /* look for adds */
        if (buf[0] == '+') {
-               if ((newtarget == 0) || (newtarget == INADDR_BROADCAST)) {
-                       printk(KERN_ERR DRV_NAME
-                              ": %s: invalid ARP target %u.%u.%u.%u specified for addition\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+               if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
+                       pr_err("%s: invalid ARP target %pI4 specified for addition\n",
+                              bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
                /* look for an empty slot to put the target in, and check for dupes */
-               for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+               for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) { /* duplicate */
-                               printk(KERN_ERR DRV_NAME
-                                      ": %s: ARP target %u.%u.%u.%u is already present\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
-                               if (done)
-                                       targets[i] = 0;
+                               pr_err("%s: ARP target %pI4 is already present\n",
+                                      bond->dev->name, &newtarget);
                                ret = -EINVAL;
                                goto out;
                        }
-                       if (targets[i] == 0 && !done) {
-                               printk(KERN_INFO DRV_NAME
-                                      ": %s: adding ARP target %d.%d.%d.%d.\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
+                       if (targets[i] == 0) {
+                               pr_info("%s: adding ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                done = 1;
                                targets[i] = newtarget;
                        }
                }
                if (!done) {
-                       printk(KERN_ERR DRV_NAME
-                              ": %s: ARP target table is full!\n",
+                       pr_err("%s: ARP target table is full!\n",
                               bond->dev->name);
                        ret = -EINVAL;
                        goto out;
                }
 
-       }
-       else if (buf[0] == '-') {
-               if ((newtarget == 0) || (newtarget == INADDR_BROADCAST)) {
-                       printk(KERN_ERR DRV_NAME
-                              ": %s: invalid ARP target %d.%d.%d.%d specified for removal\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+       } else if (buf[0] == '-')       {
+               if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
+                       pr_err("%s: invalid ARP target %pI4 specified for removal\n",
+                              bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
 
-               for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+               for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) {
-                               printk(KERN_INFO DRV_NAME
-                                      ": %s: removing ARP target %d.%d.%d.%d.\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
-                               targets[i] = 0;
+                               int j;
+                               pr_info("%s: removing ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
+                               for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
+                                       targets[j] = targets[j+1];
+
+                               targets[j] = 0;
                                done = 1;
                        }
                }
                if (!done) {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: unable to remove nonexistent ARP target %d.%d.%d.%d.\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+                       pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
-       }
-       else {
-               printk(KERN_ERR DRV_NAME ": no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
-                       bond->dev->name);
+       } else {
+               pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                      bond->dev->name);
                ret = -EPERM;
                goto out;
        }
@@ -775,7 +661,7 @@ static ssize_t bonding_show_downdelay(struct device *d,
 {
        struct bonding *bond = to_bond(d);
 
-       return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon) + 1;
+       return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon);
 }
 
 static ssize_t bonding_store_downdelay(struct device *d,
@@ -786,45 +672,42 @@ static ssize_t bonding_store_downdelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Unable to set down delay as MII monitoring is disabled\n",
+               pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: no down delay value specified.\n",
-                      bond->dev->name);
+               pr_err("%s: no down delay value specified.\n", bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
                if ((new_value % bond->params.miimon) != 0) {
-                       printk(KERN_WARNING DRV_NAME
-                              ": %s: Warning: down delay (%d) is not a multiple "
-                              "of miimon (%d), delay rounded to %d ms\n",
-                              bond->dev->name, new_value, bond->params.miimon,
-                              (new_value / bond->params.miimon) *
-                              bond->params.miimon);
+                       pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
+                                  bond->dev->name, new_value,
+                                  bond->params.miimon,
+                                  (new_value / bond->params.miimon) *
+                                  bond->params.miimon);
                }
                bond->params.downdelay = new_value / bond->params.miimon;
-               printk(KERN_INFO DRV_NAME ": %s: Setting down delay to %d.\n",
-                      bond->dev->name, bond->params.downdelay * bond->params.miimon);
+               pr_info("%s: Setting down delay to %d.\n",
+                       bond->dev->name,
+                       bond->params.downdelay * bond->params.miimon);
 
        }
 
 out:
        return ret;
 }
-static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR , bonding_show_downdelay, bonding_store_downdelay);
+static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR,
+                  bonding_show_downdelay, bonding_store_downdelay);
 
 static ssize_t bonding_show_updelay(struct device *d,
                                    struct device_attribute *attr,
@@ -832,7 +715,7 @@ static ssize_t bonding_show_updelay(struct device *d,
 {
        struct bonding *bond = to_bond(d);
 
-       return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon) + 1;
+       return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon);
 
 }
 
@@ -844,45 +727,42 @@ static ssize_t bonding_store_updelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Unable to set up delay as MII monitoring is disabled\n",
+               pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: no up delay value specified.\n",
+               pr_err("%s: no up delay value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
                if ((new_value % bond->params.miimon) != 0) {
-                       printk(KERN_WARNING DRV_NAME
-                              ": %s: Warning: up delay (%d) is not a multiple "
-                              "of miimon (%d), updelay rounded to %d ms\n",
-                              bond->dev->name, new_value, bond->params.miimon,
-                              (new_value / bond->params.miimon) *
-                              bond->params.miimon);
+                       pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
+                                  bond->dev->name, new_value,
+                                  bond->params.miimon,
+                                  (new_value / bond->params.miimon) *
+                                  bond->params.miimon);
                }
                bond->params.updelay = new_value / bond->params.miimon;
-               printk(KERN_INFO DRV_NAME ": %s: Setting up delay to %d.\n",
-                      bond->dev->name, bond->params.updelay * bond->params.miimon);
-
+               pr_info("%s: Setting up delay to %d.\n",
+                       bond->dev->name,
+                       bond->params.updelay * bond->params.miimon);
        }
 
 out:
        return ret;
 }
-static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR , bonding_show_updelay, bonding_store_updelay);
+static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR,
+                  bonding_show_updelay, bonding_store_updelay);
 
 /*
  * Show and set the LACP interval.  Interface must be down, and the mode
@@ -896,7 +776,7 @@ static ssize_t bonding_show_lacp(struct device *d,
 
        return sprintf(buf, "%s %d\n",
                bond_lacp_tbl[bond->params.lacp_fast].modename,
-               bond->params.lacp_fast) + 1;
+               bond->params.lacp_fast);
 }
 
 static ssize_t bonding_store_lacp(struct device *d,
@@ -907,38 +787,104 @@ static ssize_t bonding_store_lacp(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Unable to update LACP rate because interface is up.\n",
+               pr_err("%s: Unable to update LACP rate because interface is up.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (bond->params.mode != BOND_MODE_8023AD) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+               pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
-       new_value = bond_parse_parm((char *)buf, bond_lacp_tbl);
+       new_value = bond_parse_parm(buf, bond_lacp_tbl);
 
        if ((new_value == 1) || (new_value == 0)) {
                bond->params.lacp_fast = new_value;
-               printk(KERN_INFO DRV_NAME
-                      ": %s: Setting LACP rate to %s (%d).\n",
-                      bond->dev->name, bond_lacp_tbl[new_value].modename, new_value);
+               pr_info("%s: Setting LACP rate to %s (%d).\n",
+                       bond->dev->name, bond_lacp_tbl[new_value].modename,
+                       new_value);
+       } else {
+               pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
+                      bond->dev->name, (int)strlen(buf) - 1, buf);
+               ret = -EINVAL;
+       }
+out:
+       return ret;
+}
+static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR,
+                  bonding_show_lacp, bonding_store_lacp);
+
+static ssize_t bonding_show_ad_select(struct device *d,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+       struct bonding *bond = to_bond(d);
+
+       return sprintf(buf, "%s %d\n",
+               ad_select_tbl[bond->params.ad_select].modename,
+               bond->params.ad_select);
+}
+
+
+static ssize_t bonding_store_ad_select(struct device *d,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(d);
+
+       if (bond->dev->flags & IFF_UP) {
+               pr_err("%s: Unable to update ad_select because interface is up.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       new_value = bond_parse_parm(buf, ad_select_tbl);
+
+       if (new_value != -1) {
+               bond->params.ad_select = new_value;
+               pr_info("%s: Setting ad_select to %s (%d).\n",
+                       bond->dev->name, ad_select_tbl[new_value].modename,
+                       new_value);
        } else {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Ignoring invalid LACP rate value %.*s.\n",
-                       bond->dev->name, (int)strlen(buf) - 1, buf);
+               pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
+                      bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
        }
 out:
        return ret;
 }
-static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, bonding_show_lacp, bonding_store_lacp);
+static DEVICE_ATTR(ad_select, S_IRUGO | S_IWUSR,
+                  bonding_show_ad_select, bonding_store_ad_select);
+
+/*
+ * Show and set the number of peer notifications to send after a failover event.
+ */
+static ssize_t bonding_show_num_peer_notif(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+       struct bonding *bond = to_bond(d);
+       return sprintf(buf, "%d\n", bond->params.num_peer_notif);
+}
+
+static ssize_t bonding_store_num_peer_notif(struct device *d,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+       struct bonding *bond = to_bond(d);
+       int err = kstrtou8(buf, 10, &bond->params.num_peer_notif);
+       return err ? err : count;
+}
+static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR,
+                  bonding_show_num_peer_notif, bonding_store_num_peer_notif);
+static DEVICE_ATTR(num_unsol_na, S_IRUGO | S_IWUSR,
+                  bonding_show_num_peer_notif, bonding_store_num_peer_notif);
 
 /*
  * Show and set the MII monitor interval.  There are two tricky bits
@@ -952,7 +898,7 @@ static ssize_t bonding_show_miimon(struct device *d,
 {
        struct bonding *bond = to_bond(d);
 
-       return sprintf(buf, "%d\n", bond->params.miimon) + 1;
+       return sprintf(buf, "%d\n", bond->params.miimon);
 }
 
 static ssize_t bonding_store_miimon(struct device *d,
@@ -963,52 +909,39 @@ static ssize_t bonding_store_miimon(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: no miimon value specified.\n",
+               pr_err("%s: no miimon value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: Setting MII monitoring interval to %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Setting MII monitoring interval to %d.\n",
+                       bond->dev->name, new_value);
                bond->params.miimon = new_value;
-               if(bond->params.updelay)
-                       printk(KERN_INFO DRV_NAME
-                             ": %s: Note: Updating updelay (to %d) "
-                             "since it is a multiple of the miimon value.\n",
-                             bond->dev->name,
-                             bond->params.updelay * bond->params.miimon);
-               if(bond->params.downdelay)
-                       printk(KERN_INFO DRV_NAME
-                             ": %s: Note: Updating downdelay (to %d) "
-                             "since it is a multiple of the miimon value.\n",
-                             bond->dev->name,
-                             bond->params.downdelay * bond->params.miimon);
+               if (bond->params.updelay)
+                       pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
+                               bond->dev->name,
+                               bond->params.updelay * bond->params.miimon);
+               if (bond->params.downdelay)
+                       pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
+                               bond->dev->name,
+                               bond->params.downdelay * bond->params.miimon);
                if (bond->params.arp_interval) {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: MII monitoring cannot be used with "
-                              "ARP monitoring. Disabling ARP monitoring...\n",
-                              bond->dev->name);
+                       pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
+                               bond->dev->name);
                        bond->params.arp_interval = 0;
                        if (bond->params.arp_validate) {
-                               bond_unregister_arp(bond);
                                bond->params.arp_validate =
                                        BOND_ARP_VALIDATE_NONE;
                        }
-                       /* Kill ARP timer, else it brings bond's link down */
-                       if (bond->mii_timer.function) {
-                               printk(KERN_INFO DRV_NAME
-                               ": %s: Kill ARP timer, else it brings bond's link down...\n",
-                              bond->dev->name);
-                               del_timer_sync(&bond->arp_timer);
+                       if (delayed_work_pending(&bond->arp_work)) {
+                               cancel_delayed_work(&bond->arp_work);
+                               flush_workqueue(bond->wq);
                        }
                }
 
@@ -1018,25 +951,19 @@ static ssize_t bonding_store_miimon(struct device *d,
                         * timer will get fired off when the open function
                         * is called.
                         */
-                       if (bond->mii_timer.function) {
-                               /* The timer's already set up, so fire it off */
-                               mod_timer(&bond->mii_timer, jiffies + 1);
-                       } else {
-                               /* Set up the timer. */
-                               init_timer(&bond->mii_timer);
-                               bond->mii_timer.expires = jiffies + 1;
-                               bond->mii_timer.data =
-                                       (unsigned long) bond->dev;
-                               bond->mii_timer.function =
-                                       (void *) &bond_mii_monitor;
-                               add_timer(&bond->mii_timer);
+                       if (!delayed_work_pending(&bond->mii_work)) {
+                               INIT_DELAYED_WORK(&bond->mii_work,
+                                                 bond_mii_monitor);
+                               queue_delayed_work(bond->wq,
+                                                  &bond->mii_work, 0);
                        }
                }
        }
 out:
        return ret;
 }
-static DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, bonding_show_miimon, bonding_store_miimon);
+static DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR,
+                  bonding_show_miimon, bonding_store_miimon);
 
 /*
  * Show and set the primary slave.  The store function is much
@@ -1053,9 +980,7 @@ static ssize_t bonding_show_primary(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->primary_slave)
-               count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1;
-       else
-               count = sprintf(buf, "\n") + 1;
+               count = sprintf(buf, "%s\n", bond->primary_slave->dev->name);
 
        return count;
 }
@@ -1068,20 +993,24 @@ static ssize_t bonding_store_primary(struct device *d,
        struct slave *slave;
        struct bonding *bond = to_bond(d);
 
-       write_lock_bh(&bond->lock);
+       if (!rtnl_trylock())
+               return restart_syscall();
+       block_netpoll_tx();
+       read_lock(&bond->lock);
+       write_lock_bh(&bond->curr_slave_lock);
+
        if (!USES_PRIMARY(bond->params.mode)) {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: Unable to set primary slave; %s is in mode %d\n",
-                      bond->dev->name, bond->dev->name, bond->params.mode);
+               pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
+                       bond->dev->name, bond->dev->name, bond->params.mode);
        } else {
                bond_for_each_slave(bond, slave, i) {
                        if (strnicmp
                            (slave->dev->name, buf,
                             strlen(slave->dev->name)) == 0) {
-                               printk(KERN_INFO DRV_NAME
-                                      ": %s: Setting %s as primary slave.\n",
-                                      bond->dev->name, slave->dev->name);
+                               pr_info("%s: Setting %s as primary slave.\n",
+                                       bond->dev->name, slave->dev->name);
                                bond->primary_slave = slave;
+                               strcpy(bond->params.primary, slave->dev->name);
                                bond_select_active_slave(bond);
                                goto out;
                        }
@@ -1090,22 +1019,78 @@ static ssize_t bonding_store_primary(struct device *d,
                /* if we got here, then we didn't match the name of any slave */
 
                if (strlen(buf) == 0 || buf[0] == '\n') {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: Setting primary slave to None.\n",
-                              bond->dev->name);
+                       pr_info("%s: Setting primary slave to None.\n",
+                               bond->dev->name);
                        bond->primary_slave = NULL;
                                bond_select_active_slave(bond);
                } else {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
-                              bond->dev->name, (int)strlen(buf) - 1, buf);
+                       pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                               bond->dev->name, (int)strlen(buf) - 1, buf);
                }
        }
 out:
-       write_unlock_bh(&bond->lock);
+       write_unlock_bh(&bond->curr_slave_lock);
+       read_unlock(&bond->lock);
+       unblock_netpoll_tx();
+       rtnl_unlock();
+
        return count;
 }
-static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR, bonding_show_primary, bonding_store_primary);
+static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR,
+                  bonding_show_primary, bonding_store_primary);
+
+/*
+ * Show and set the primary_reselect flag.
+ */
+static ssize_t bonding_show_primary_reselect(struct device *d,
+                                            struct device_attribute *attr,
+                                            char *buf)
+{
+       struct bonding *bond = to_bond(d);
+
+       return sprintf(buf, "%s %d\n",
+                      pri_reselect_tbl[bond->params.primary_reselect].modename,
+                      bond->params.primary_reselect);
+}
+
+static ssize_t bonding_store_primary_reselect(struct device *d,
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(d);
+
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       new_value = bond_parse_parm(buf, pri_reselect_tbl);
+       if (new_value < 0)  {
+               pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
+                      bond->dev->name,
+                      (int) strlen(buf) - 1, buf);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       bond->params.primary_reselect = new_value;
+       pr_info("%s: setting primary_reselect to %s (%d).\n",
+               bond->dev->name, pri_reselect_tbl[new_value].modename,
+               new_value);
+
+       block_netpoll_tx();
+       read_lock(&bond->lock);
+       write_lock_bh(&bond->curr_slave_lock);
+       bond_select_active_slave(bond);
+       write_unlock_bh(&bond->curr_slave_lock);
+       read_unlock(&bond->lock);
+       unblock_netpoll_tx();
+out:
+       rtnl_unlock();
+       return ret;
+}
+static DEVICE_ATTR(primary_reselect, S_IRUGO | S_IWUSR,
+                  bonding_show_primary_reselect,
+                  bonding_store_primary_reselect);
 
 /*
  * Show and set the use_carrier flag.
@@ -1116,7 +1101,7 @@ static ssize_t bonding_show_carrier(struct device *d,
 {
        struct bonding *bond = to_bond(d);
 
-       return sprintf(buf, "%d\n", bond->params.use_carrier) + 1;
+       return sprintf(buf, "%d\n", bond->params.use_carrier);
 }
 
 static ssize_t bonding_store_carrier(struct device *d,
@@ -1128,25 +1113,24 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               printk(KERN_ERR DRV_NAME
-                      ": %s: no use_carrier value specified.\n",
+               pr_err("%s: no use_carrier value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if ((new_value == 0) || (new_value == 1)) {
                bond->params.use_carrier = new_value;
-               printk(KERN_INFO DRV_NAME ": %s: Setting use_carrier to %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Setting use_carrier to %d.\n",
+                       bond->dev->name, new_value);
        } else {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: Ignoring invalid use_carrier value %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Ignoring invalid use_carrier value %d.\n",
+                       bond->dev->name, new_value);
        }
 out:
-       return count;
+       return ret;
 }
-static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR, bonding_show_carrier, bonding_store_carrier);
+static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,
+                  bonding_show_carrier, bonding_store_carrier);
 
 
 /*
@@ -1158,17 +1142,14 @@ static ssize_t bonding_show_active_slave(struct device *d,
 {
        struct slave *curr;
        struct bonding *bond = to_bond(d);
-       int count;
-
+       int count = 0;
 
        read_lock(&bond->curr_slave_lock);
        curr = bond->curr_active_slave;
        read_unlock(&bond->curr_slave_lock);
 
        if (USES_PRIMARY(bond->params.mode) && curr)
-               count = sprintf(buf, "%s\n", curr->dev->name) + 1;
-       else
-               count = sprintf(buf, "\n") + 1;
+               count = sprintf(buf, "%s\n", curr->dev->name);
        return count;
 }
 
@@ -1178,16 +1159,21 @@ static ssize_t bonding_store_active_slave(struct device *d,
 {
        int i;
        struct slave *slave;
-        struct slave *old_active = NULL;
-        struct slave *new_active = NULL;
+       struct slave *old_active = NULL;
+       struct slave *new_active = NULL;
        struct bonding *bond = to_bond(d);
 
-       write_lock_bh(&bond->lock);
-       if (!USES_PRIMARY(bond->params.mode)) {
-               printk(KERN_INFO DRV_NAME
-                      ": %s: Unable to change active slave; %s is in mode %d\n",
-                      bond->dev->name, bond->dev->name, bond->params.mode);
-       } else {
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       block_netpoll_tx();
+       read_lock(&bond->lock);
+       write_lock_bh(&bond->curr_slave_lock);
+
+       if (!USES_PRIMARY(bond->params.mode))
+               pr_info("%s: Unable to change active slave; %s is in mode %d\n",
+                       bond->dev->name, bond->dev->name, bond->params.mode);
+       else {
                bond_for_each_slave(bond, slave, i) {
                        if (strnicmp
                            (slave->dev->name, buf,
@@ -1196,9 +1182,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                new_active = slave;
                                if (new_active == old_active) {
                                        /* do nothing */
-                                       printk(KERN_INFO DRV_NAME
-                                              ": %s: %s is already the current active slave.\n",
-                                              bond->dev->name, slave->dev->name);
+                                       pr_info("%s: %s is already the current active slave.\n",
+                                               bond->dev->name,
+                                               slave->dev->name);
                                        goto out;
                                }
                                else {
@@ -1206,17 +1192,16 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                            (old_active) &&
                                            (new_active->link == BOND_LINK_UP) &&
                                            IS_UP(new_active->dev)) {
-                                               printk(KERN_INFO DRV_NAME
-                                                     ": %s: Setting %s as active slave.\n",
-                                                     bond->dev->name, slave->dev->name);
-                                               bond_change_active_slave(bond, new_active);
+                                               pr_info("%s: Setting %s as active slave.\n",
+                                                       bond->dev->name,
+                                                       slave->dev->name);
+                                                       bond_change_active_slave(bond, new_active);
                                        }
                                        else {
-                                               printk(KERN_INFO DRV_NAME
-                                                     ": %s: Could not set %s as active slave; "
-                                                     "either %s is down or the link is down.\n",
-                                                     bond->dev->name, slave->dev->name,
-                                                     slave->dev->name);
+                                               pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
+                                                       bond->dev->name,
+                                                       slave->dev->name,
+                                                       slave->dev->name);
                                        }
                                        goto out;
                                }
@@ -1226,23 +1211,27 @@ static ssize_t bonding_store_active_slave(struct device *d,
                /* if we got here, then we didn't match the name of any slave */
 
                if (strlen(buf) == 0 || buf[0] == '\n') {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: Setting active slave to None.\n",
-                              bond->dev->name);
+                       pr_info("%s: Setting active slave to None.\n",
+                               bond->dev->name);
                        bond->primary_slave = NULL;
-                               bond_select_active_slave(bond);
+                       bond_select_active_slave(bond);
                } else {
-                       printk(KERN_INFO DRV_NAME
-                              ": %s: Unable to set %.*s as active slave as it is not a slave.\n",
-                              bond->dev->name, (int)strlen(buf) - 1, buf);
+                       pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
+                               bond->dev->name, (int)strlen(buf) - 1, buf);
                }
        }
-out:
-       write_unlock_bh(&bond->lock);
+ out:
+       write_unlock_bh(&bond->curr_slave_lock);
+       read_unlock(&bond->lock);
+       unblock_netpoll_tx();
+
+       rtnl_unlock();
+
        return count;
 
 }
-static DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR, bonding_show_active_slave, bonding_store_active_slave);
+static DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR,
+                  bonding_show_active_slave, bonding_store_active_slave);
 
 
 /*
@@ -1259,7 +1248,7 @@ static ssize_t bonding_show_mii_status(struct device *d,
        curr = bond->curr_active_slave;
        read_unlock(&bond->curr_slave_lock);
 
-       return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1;
+       return sprintf(buf, "%s\n", curr ? "up" : "down");
 }
 static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
 
@@ -1276,10 +1265,10 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id) + 1;
+               count = sprintf(buf, "%d\n",
+                               (bond_3ad_get_active_agg_info(bond, &ad_info))
+                               ?  0 : ad_info.aggregator_id);
        }
-       else
-               count = sprintf(buf, "\n") + 1;
 
        return count;
 }
@@ -1298,10 +1287,10 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports) + 1;
+               count = sprintf(buf, "%d\n",
+                               (bond_3ad_get_active_agg_info(bond, &ad_info))
+                               ?  0 : ad_info.ports);
        }
-       else
-               count = sprintf(buf, "\n") + 1;
 
        return count;
 }
@@ -1320,10 +1309,10 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key) + 1;
+               count = sprintf(buf, "%d\n",
+                               (bond_3ad_get_active_agg_info(bond, &ad_info))
+                               ?  0 : ad_info.actor_key);
        }
-       else
-               count = sprintf(buf, "\n") + 1;
 
        return count;
 }
@@ -1342,10 +1331,10 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key) + 1;
+               count = sprintf(buf, "%d\n",
+                               (bond_3ad_get_active_agg_info(bond, &ad_info))
+                               ?  0 : ad_info.partner_key);
        }
-       else
-               count = sprintf(buf, "\n") + 1;
 
        return count;
 }
@@ -1364,37 +1353,242 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-               if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                       count = sprintf(buf,"%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                      ad_info.partner_system[0],
-                                      ad_info.partner_system[1],
-                                      ad_info.partner_system[2],
-                                      ad_info.partner_system[3],
-                                      ad_info.partner_system[4],
-                                      ad_info.partner_system[5]) + 1;
-               }
+               if (!bond_3ad_get_active_agg_info(bond, &ad_info))
+                       count = sprintf(buf, "%pM\n", ad_info.partner_system);
        }
-       else
-               count = sprintf(buf, "\n") + 1;
 
        return count;
 }
 static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 
+/*
+ * Show the queue_ids of the slaves in the current bond.
+ */
+static ssize_t bonding_show_queue_id(struct device *d,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+       struct slave *slave;
+       int i, res = 0;
+       struct bonding *bond = to_bond(d);
+
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       read_lock(&bond->lock);
+       bond_for_each_slave(bond, slave, i) {
+               if (res > (PAGE_SIZE - IFNAMSIZ - 6)) {
+                       /* not enough space for another interface_name:queue_id pair */
+                       if ((PAGE_SIZE - res) > 10)
+                               res = PAGE_SIZE - 10;
+                       res += sprintf(buf + res, "++more++ ");
+                       break;
+               }
+               res += sprintf(buf + res, "%s:%d ",
+                              slave->dev->name, slave->queue_id);
+       }
+       read_unlock(&bond->lock);
+       if (res)
+               buf[res-1] = '\n'; /* eat the leftover space */
+       rtnl_unlock();
+       return res;
+}
+
+/*
+ * Set the queue_ids of the  slaves in the current bond.  The bond
+ * interface must be enslaved for this to work.
+ */
+static ssize_t bonding_store_queue_id(struct device *d,
+                                     struct device_attribute *attr,
+                                     const char *buffer, size_t count)
+{
+       struct slave *slave, *update_slave;
+       struct bonding *bond = to_bond(d);
+       u16 qid;
+       int i, ret = count;
+       char *delim;
+       struct net_device *sdev = NULL;
+
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       /* delim will point to queue id if successful */
+       delim = strchr(buffer, ':');
+       if (!delim)
+               goto err_no_cmd;
+
+       /*
+        * Terminate string that points to device name and bump it
+        * up one, so we can read the queue id there.
+        */
+       *delim = '\0';
+       if (sscanf(++delim, "%hd\n", &qid) != 1)
+               goto err_no_cmd;
+
+       /* Check buffer length, valid ifname and queue id */
+       if (strlen(buffer) > IFNAMSIZ ||
+           !dev_valid_name(buffer) ||
+           qid > bond->params.tx_queues)
+               goto err_no_cmd;
+
+       /* Get the pointer to that interface if it exists */
+       sdev = __dev_get_by_name(dev_net(bond->dev), buffer);
+       if (!sdev)
+               goto err_no_cmd;
+
+       read_lock(&bond->lock);
+
+       /* Search for thes slave and check for duplicate qids */
+       update_slave = NULL;
+       bond_for_each_slave(bond, slave, i) {
+               if (sdev == slave->dev)
+                       /*
+                        * We don't need to check the matching
+                        * slave for dups, since we're overwriting it
+                        */
+                       update_slave = slave;
+               else if (qid && qid == slave->queue_id) {
+                       goto err_no_cmd_unlock;
+               }
+       }
+
+       if (!update_slave)
+               goto err_no_cmd_unlock;
+
+       /* Actually set the qids for the slave */
+       update_slave->queue_id = qid;
+
+       read_unlock(&bond->lock);
+out:
+       rtnl_unlock();
+       return ret;
+
+err_no_cmd_unlock:
+       read_unlock(&bond->lock);
+err_no_cmd:
+       pr_info("invalid input for queue_id set for %s.\n",
+               bond->dev->name);
+       ret = -EPERM;
+       goto out;
+}
+
+static DEVICE_ATTR(queue_id, S_IRUGO | S_IWUSR, bonding_show_queue_id,
+                  bonding_store_queue_id);
+
+
+/*
+ * Show and set the all_slaves_active flag.
+ */
+static ssize_t bonding_show_slaves_active(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
+{
+       struct bonding *bond = to_bond(d);
+
+       return sprintf(buf, "%d\n", bond->params.all_slaves_active);
+}
+
+static ssize_t bonding_store_slaves_active(struct device *d,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
+{
+       int i, new_value, ret = count;
+       struct bonding *bond = to_bond(d);
+       struct slave *slave;
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               pr_err("%s: no all_slaves_active value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (new_value == bond->params.all_slaves_active)
+               goto out;
+
+       if ((new_value == 0) || (new_value == 1)) {
+               bond->params.all_slaves_active = new_value;
+       } else {
+               pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
+                       bond->dev->name, new_value);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       bond_for_each_slave(bond, slave, i) {
+               if (!bond_is_active_slave(slave)) {
+                       if (new_value)
+                               slave->inactive = 0;
+                       else
+                               slave->inactive = 1;
+               }
+       }
+out:
+       return ret;
+}
+static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
+                  bonding_show_slaves_active, bonding_store_slaves_active);
+
+/*
+ * Show and set the number of IGMP membership reports to send on link failure
+ */
+static ssize_t bonding_show_resend_igmp(struct device *d,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+       struct bonding *bond = to_bond(d);
+
+       return sprintf(buf, "%d\n", bond->params.resend_igmp);
+}
+
+static ssize_t bonding_store_resend_igmp(struct device *d,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(d);
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               pr_err("%s: no resend_igmp value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (new_value < 0 || new_value > 255) {
+               pr_err("%s: Invalid resend_igmp value %d not in range 0-255; rejected.\n",
+                      bond->dev->name, new_value);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       pr_info("%s: Setting resend_igmp to %d.\n",
+               bond->dev->name, new_value);
+       bond->params.resend_igmp = new_value;
+out:
+       return ret;
+}
 
+static DEVICE_ATTR(resend_igmp, S_IRUGO | S_IWUSR,
+                  bonding_show_resend_igmp, bonding_store_resend_igmp);
 
 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,
        &dev_attr_downdelay.attr,
        &dev_attr_updelay.attr,
        &dev_attr_lacp_rate.attr,
+       &dev_attr_ad_select.attr,
        &dev_attr_xmit_hash_policy.attr,
+       &dev_attr_num_grat_arp.attr,
+       &dev_attr_num_unsol_na.attr,
        &dev_attr_miimon.attr,
        &dev_attr_primary.attr,
+       &dev_attr_primary_reselect.attr,
        &dev_attr_use_carrier.attr,
        &dev_attr_active_slave.attr,
        &dev_attr_mii_status.attr,
@@ -1403,6 +1597,9 @@ static struct attribute *per_bond_attrs[] = {
        &dev_attr_ad_actor_key.attr,
        &dev_attr_ad_partner_key.attr,
        &dev_attr_ad_partner_mac.attr,
+       &dev_attr_queue_id.attr,
+       &dev_attr_all_slaves_active.attr,
+       &dev_attr_resend_igmp.attr,
        NULL,
 };
 
@@ -1417,21 +1614,9 @@ static struct attribute_group bonding_group = {
  */
 int bond_create_sysfs(void)
 {
-       int ret = 0;
-       struct bonding *firstbond;
-
-       init_rwsem(&bonding_rwsem);
+       int ret;
 
-       /* get the netdev class pointer */
-       firstbond = container_of(bond_dev_list.next, struct bonding, bond_list);
-       if (!firstbond)
-               return -ENODEV;
-
-       netdev_class = firstbond->dev->dev.class;
-       if (!netdev_class)
-               return -ENODEV;
-
-       ret = class_create_file(netdev_class, &class_attr_bonding_masters);
+       ret = netdev_class_create_file(&class_attr_bonding_masters);
        /*
         * Permit multiple loads of the module by ignoring failures to
         * create the bonding_masters sysfs file.  Bonding devices
@@ -1444,8 +1629,12 @@ int bond_create_sysfs(void)
         * configure multiple bonding devices.
         */
        if (ret == -EEXIST) {
-               netdev_class = NULL;
-               return 0;
+               /* Is someone being kinky and naming a device bonding_master? */
+               if (__dev_get_by_name(&init_net,
+                                     class_attr_bonding_masters.attr.name))
+                       pr_err("network device named %s already exists in sysfs",
+                              class_attr_bonding_masters.attr.name);
+               ret = 0;
        }
 
        return ret;
@@ -1457,36 +1646,15 @@ int bond_create_sysfs(void)
  */
 void bond_destroy_sysfs(void)
 {
-       if (netdev_class)
-               class_remove_file(netdev_class, &class_attr_bonding_masters);
+       netdev_class_remove_file(&class_attr_bonding_masters);
 }
 
 /*
  * Initialize sysfs for each bond.  This sets up and registers
  * the 'bondctl' directory for each individual bond under /sys/class/net.
  */
-int bond_create_sysfs_entry(struct bonding *bond)
+void bond_prepare_sysfs_group(struct bonding *bond)
 {
-       struct net_device *dev = bond->dev;
-       int err;
-
-       err = sysfs_create_group(&(dev->dev.kobj), &bonding_group);
-       if (err) {
-               printk(KERN_EMERG "eek! didn't create group!\n");
-       }
-
-       if (expected_refcount < 1)
-               expected_refcount = atomic_read(&bond->dev->dev.kobj.kref.refcount);
-
-       return err;
-}
-/*
- * Remove sysfs entries for each bond.
- */
-void bond_destroy_sysfs_entry(struct bonding *bond)
-{
-       struct net_device *dev = bond->dev;
-
-       sysfs_remove_group(&(dev->dev.kobj), &bonding_group);
+       bond->dev->sysfs_groups[0] = &bonding_group;
 }