bonding: documentation and code cleanup for resend_igmp
[linux-2.6.git] / drivers / net / bonding / bond_sysfs.c
index 8762a27..88fcb25 100644 (file)
@@ -19,6 +19,9 @@
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -36,6 +39,8 @@
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
 #include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <linux/nsproxy.h>
 
 #include "bonding.h"
 
  * "show" function for the bond_masters attribute.
  * The class parameter is ignored.
  */
-static ssize_t bonding_show_bonds(struct class *cls, char *buf)
+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;
 
        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)
@@ -70,11 +79,12 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buf)
        return res;
 }
 
-static struct net_device *bond_get_by_name(const char *ifname)
+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, &bond_dev_list, bond_list) {
+       list_for_each_entry(bond, &bn->dev_list, bond_list) {
                if (strncmp(bond->dev->name, ifname, IFNAMSIZ) == 0)
                        return bond->dev;
        }
@@ -90,8 +100,10 @@ static struct net_device *bond_get_by_name(const char *ifname)
  */
 
 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 rv, res = count;
@@ -103,25 +115,25 @@ static ssize_t bonding_store_bonds(struct class *cls,
                goto err_no_cmd;
 
        if (command[0] == '+') {
-               pr_info(DRV_NAME
-                       ": %s is being created...\n", ifname);
-               rv = bond_create(ifname);
+               pr_info("%s is being created...\n", ifname);
+               rv = bond_create(net, ifname);
                if (rv) {
-                       pr_info(DRV_NAME ": Bond creation failed.\n");
+                       if (rv == -EEXIST)
+                               pr_info("%s already exists.\n", ifname);
+                       else
+                               pr_info("%s creation failed.\n", ifname);
                        res = rv;
                }
        } else if (command[0] == '-') {
                struct net_device *bond_dev;
 
                rtnl_lock();
-               bond_dev = bond_get_by_name(ifname);
+               bond_dev = bond_get_by_name(net, ifname);
                if (bond_dev) {
-                       pr_info(DRV_NAME ": %s is being deleted...\n",
-                               ifname);
+                       pr_info("%s is being deleted...\n", ifname);
                        unregister_netdevice(bond_dev);
                } else {
-                       pr_err(DRV_NAME ": unable to delete non-existent %s\n",
-                              ifname);
+                       pr_err("unable to delete non-existent %s\n", ifname);
                        res = -ENODEV;
                }
                rtnl_unlock();
@@ -134,8 +146,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
        return res;
 
 err_no_cmd:
-       pr_err(DRV_NAME ": no command found in bonding_masters."
-              " Use +ifname or -ifname.\n");
+       pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
        return -EPERM;
 }
 
@@ -203,7 +214,8 @@ static ssize_t bonding_show_slaves(struct device *d,
 /*
  * 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,
@@ -211,20 +223,10 @@ 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;
+       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)) {
-               pr_warning(DRV_NAME ": %s: doing slave updates when "
-                          "interface is down.\n", bond->dev->name);
-       }
-
-       /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
-
        if (!rtnl_trylock())
                return restart_syscall();
 
@@ -234,100 +236,36 @@ static ssize_t bonding_store_slaves(struct device *d,
            !dev_valid_name(ifname))
                goto err_no_cmd;
 
-       if (command[0] == '+') {
-
-               /* Got a slave name in ifname.  Is it already in the list? */
-               found = 0;
-
-               /* FIXME: get netns from sysfs object */
-               dev = __dev_get_by_name(&init_net, ifname);
-               if (!dev) {
-                       pr_info(DRV_NAME
-                              ": %s: Interface %s does not exist!\n",
-                              bond->dev->name, ifname);
-                       ret = -ENODEV;
-                       goto out;
-               }
-
-               if (dev->flags & IFF_UP) {
-                       pr_err(DRV_NAME
-                              ": %s: Error: Unable to enslave %s "
-                              "because it is already up.\n",
-                              bond->dev->name, dev->name);
-                       ret = -EPERM;
-                       goto out;
-               }
-
-               read_lock(&bond->lock);
-               bond_for_each_slave(bond, slave, i)
-                       if (slave->dev == dev) {
-                               pr_err(DRV_NAME
-                                      ": %s: Interface %s is already enslaved!\n",
-                                      bond->dev->name, ifname);
-                               ret = -EPERM;
-                               read_unlock(&bond->lock);
-                               goto out;
-                       }
-               read_unlock(&bond->lock);
-
-               pr_info(DRV_NAME ": %s: Adding slave %s.\n",
+       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;
+       }
 
-               /* 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 (is_zero_ether_addr(bond->dev->dev_addr))
-                       memcpy(bond->dev->dev_addr, dev->dev_addr,
-                              dev->addr_len);
-
-               /* Set the slave's MTU to match the bond */
-               original_mtu = dev->mtu;
-               res = dev_set_mtu(dev, bond->dev->mtu);
-               if (res) {
-                       ret = res;
-                       goto out;
-               }
-
+       switch (command[0]) {
+       case '+':
+               pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
                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;
-               if (res)
-                       ret = res;
+               break;
 
-               goto out;
-       }
+       case '-':
+               pr_info("%s: Removing slave %s.\n", bond->dev->name, dev->name);
+               res = bond_release(bond->dev, dev);
+               break;
 
-       if (command[0] == '-') {
-               dev = NULL;
-               original_mtu = 0;
-               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) {
-                       pr_info(DRV_NAME ": %s: Removing slave %s\n",
-                               bond->dev->name, dev->name);
-                               res = bond_release(bond->dev, dev);
-                       if (res) {
-                               ret = res;
-                               goto out;
-                       }
-                       /* set the slave MTU to the default */
-                       dev_set_mtu(dev, original_mtu);
-               } else {
-                       pr_err(DRV_NAME ": unable to remove non-existent"
-                              " slave %s for bond %s.\n",
-                               ifname, bond->dev->name);
-                       ret = -ENODEV;
-               }
-               goto out;
+       default:
+               goto err_no_cmd;
        }
 
+       if (res)
+               ret = res;
+       goto out;
+
 err_no_cmd:
-       pr_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:
@@ -360,33 +298,33 @@ static ssize_t bonding_store_mode(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME ": unable to update mode of %s"
-                      " because interface is up.\n", bond->dev->name);
+               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(buf, bond_mode_tbl);
        if (new_value < 0)  {
-               pr_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;
-       } 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);
-               pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
-                      bond->dev->name, bond_mode_tbl[new_value].modename,
-                      new_value);
        }
+       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;
+       }
+
+       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;
 }
@@ -416,8 +354,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME
-                      "%s: Interface is up. Unable to update xmit policy.\n",
+               pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
@@ -425,8 +362,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
        new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
        if (new_value < 0)  {
-               pr_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;
@@ -434,7 +370,7 @@ 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);
-               pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+               pr_info("%s: setting xmit hash policy to %s (%d).\n",
                        bond->dev->name,
                        xmit_hashtype_tbl[new_value].modename, new_value);
        }
@@ -467,25 +403,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
        new_value = bond_parse_parm(buf, arp_validate_tbl);
        if (new_value < 0) {
-               pr_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)) {
-               pr_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;
        }
-       pr_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;
 
@@ -518,24 +447,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->slave_cnt != 0) {
-               pr_err(DRV_NAME
-                      ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+               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(DRV_NAME
-                      ": %s: Ignoring invalid fail_over_mac value %s.\n",
+               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(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
-              bond->dev->name, fail_over_mac_tbl[new_value].modename,
-              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;
 }
@@ -566,31 +493,30 @@ static ssize_t bonding_store_arp_interval(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_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) {
-               pr_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;
        }
-
-       pr_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.arp_interval)
-               bond->dev->priv_flags |= IFF_MASTER_ARPMON;
        if (bond->params.miimon) {
-               pr_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;
                if (delayed_work_pending(&bond->mii_work)) {
                        cancel_delayed_work(&bond->mii_work);
@@ -598,10 +524,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                }
        }
        if (!bond->params.arp_targets[0]) {
-               pr_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
@@ -661,8 +585,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
        /* look for adds */
        if (buf[0] == '+') {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                       pr_err(DRV_NAME
-                              ": %s: invalid ARP target %pI4 specified for addition\n",
+                       pr_err("%s: invalid ARP target %pI4 specified for addition\n",
                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
@@ -670,23 +593,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                /* look for an empty slot to put the target in, and check for dupes */
                for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) { /* duplicate */
-                               pr_err(DRV_NAME
-                                      ": %s: ARP target %pI4 is already present\n",
+                               pr_err("%s: ARP target %pI4 is already present\n",
                                       bond->dev->name, &newtarget);
                                ret = -EINVAL;
                                goto out;
                        }
                        if (targets[i] == 0) {
-                               pr_info(DRV_NAME
-                                      ": %s: adding ARP target %pI4.\n",
-                                      bond->dev->name, &newtarget);
+                               pr_info("%s: adding ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                done = 1;
                                targets[i] = newtarget;
                        }
                }
                if (!done) {
-                       pr_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;
@@ -694,8 +614,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 
        } else if (buf[0] == '-')       {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                       pr_err(DRV_NAME
-                              ": %s: invalid ARP target %pI4 specified for removal\n",
+                       pr_err("%s: invalid ARP target %pI4 specified for removal\n",
                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
@@ -704,9 +623,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) {
                                int j;
-                               pr_info(DRV_NAME
-                                      ": %s: removing ARP target %pI4.\n",
-                                      bond->dev->name, &newtarget);
+                               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];
 
@@ -715,16 +633,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                        }
                }
                if (!done) {
-                       pr_info(DRV_NAME
-                              ": %s: unable to remove nonexistent ARP target %pI4.\n",
-                              bond->dev->name, &newtarget);
+                       pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
        } else {
-               pr_err(DRV_NAME ": no command found in arp_ip_targets file"
-                      " for bond %s. Use +<addr> or -<addr>.\n",
-                       bond->dev->name);
+               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;
        }
@@ -756,41 +672,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               pr_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) {
-               pr_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) {
-               pr_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) {
-                       pr_warning(DRV_NAME
-                                  ": %s: Warning: down delay (%d) is not a "
-                                  "multiple of miimon (%d), delay rounded "
-                                  "to %d ms\n",
+                       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;
-               pr_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);
 
        }
 
@@ -818,41 +727,35 @@ static ssize_t bonding_store_updelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               pr_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) {
-               pr_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) {
-               pr_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) {
-                       pr_warning(DRV_NAME
-                                  ": %s: Warning: up delay (%d) is not a "
-                                  "multiple of miimon (%d), updelay rounded "
-                                  "to %d ms\n",
+                       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;
-               pr_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:
@@ -884,16 +787,14 @@ static ssize_t bonding_store_lacp(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_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) {
-               pr_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;
@@ -903,12 +804,11 @@ static ssize_t bonding_store_lacp(struct device *d,
 
        if ((new_value == 1) || (new_value == 0)) {
                bond->params.lacp_fast = new_value;
-               pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+               pr_info("%s: Setting LACP rate to %s (%d).\n",
                        bond->dev->name, bond_lacp_tbl[new_value].modename,
                        new_value);
        } else {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid LACP rate value %.*s.\n",
+               pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
                       bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
        }
@@ -938,9 +838,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to update ad_select because interface "
-                      "is up.\n", bond->dev->name);
+               pr_err("%s: Unable to update ad_select because interface is up.\n",
+                      bond->dev->name);
                ret = -EPERM;
                goto out;
        }
@@ -949,13 +848,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
        if (new_value != -1) {
                bond->params.ad_select = new_value;
-               pr_info(DRV_NAME
-                      ": %s: Setting ad_select to %s (%d).\n",
-                      bond->dev->name, ad_select_tbl[new_value].modename,
-                      new_value);
+               pr_info("%s: Setting ad_select to %s (%d).\n",
+                       bond->dev->name, ad_select_tbl[new_value].modename,
+                       new_value);
        } else {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid ad_select value %.*s.\n",
+               pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
                       bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
        }
@@ -966,86 +863,28 @@ static DEVICE_ATTR(ad_select, S_IRUGO | S_IWUSR,
                   bonding_show_ad_select, bonding_store_ad_select);
 
 /*
- * Show and set the number of grat ARP to send after a failover event.
+ * Show and set the number of peer notifications to send after a failover event.
  */
-static ssize_t bonding_show_n_grat_arp(struct device *d,
-                                  struct device_attribute *attr,
-                                  char *buf)
+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_grat_arp);
+       return sprintf(buf, "%d\n", bond->params.num_peer_notif);
 }
 
-static ssize_t bonding_store_n_grat_arp(struct device *d,
-                                   struct device_attribute *attr,
-                                   const char *buf, size_t count)
+static ssize_t bonding_store_num_peer_notif(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(DRV_NAME
-                      ": %s: no num_grat_arp value specified.\n",
-                      bond->dev->name);
-               ret = -EINVAL;
-               goto out;
-       }
-       if (new_value < 0 || new_value > 255) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
-                      bond->dev->name, new_value);
-               ret = -EINVAL;
-               goto out;
-       } else {
-               bond->params.num_grat_arp = new_value;
-       }
-out:
-       return ret;
+       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_n_grat_arp, bonding_store_n_grat_arp);
-
-/*
- * Show and set the number of unsolicited NA's to send after a failover event.
- */
-static ssize_t bonding_show_n_unsol_na(struct device *d,
-                                      struct device_attribute *attr,
-                                      char *buf)
-{
-       struct bonding *bond = to_bond(d);
-
-       return sprintf(buf, "%d\n", bond->params.num_unsol_na);
-}
-
-static ssize_t bonding_store_n_unsol_na(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(DRV_NAME
-                      ": %s: no num_unsol_na value specified.\n",
-                      bond->dev->name);
-               ret = -EINVAL;
-               goto out;
-       }
-
-       if (new_value < 0 || new_value > 255) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
-                      bond->dev->name, new_value);
-               ret = -EINVAL;
-               goto out;
-       } else
-               bond->params.num_unsol_na = new_value;
-out:
-       return ret;
-}
+                  bonding_show_num_peer_notif, bonding_store_num_peer_notif);
 static DEVICE_ATTR(num_unsol_na, S_IRUGO | S_IWUSR,
-                  bonding_show_n_unsol_na, bonding_store_n_unsol_na);
+                  bonding_show_num_peer_notif, bonding_store_num_peer_notif);
 
 /*
  * Show and set the MII monitor interval.  There are two tricky bits
@@ -1070,44 +909,33 @@ static ssize_t bonding_store_miimon(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_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) {
-               pr_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 {
-               pr_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)
-                       pr_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);
+                       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(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);
+                       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) {
-                       pr_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;
-                       bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                        if (bond->params.arp_validate) {
-                               bond_unregister_arp(bond);
                                bond->params.arp_validate =
                                        BOND_ARP_VALIDATE_NONE;
                        }
@@ -1167,21 +995,20 @@ static ssize_t bonding_store_primary(struct device *d,
 
        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(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) {
-                               pr_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);
@@ -1192,20 +1019,19 @@ 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') {
-                       pr_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 {
-                       pr_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->curr_slave_lock);
        read_unlock(&bond->lock);
+       unblock_netpoll_tx();
        rtnl_unlock();
 
        return count;
@@ -1214,6 +1040,59 @@ 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.
  */
 static ssize_t bonding_show_carrier(struct device *d,
@@ -1234,23 +1113,21 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_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;
-               pr_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 {
-               pr_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);
@@ -1288,12 +1165,13 @@ static ssize_t bonding_store_active_slave(struct device *d,
 
        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(DRV_NAME ": %s: Unable to change active slave;"
-                       " %s is in mode %d\n",
+               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) {
@@ -1304,9 +1182,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                new_active = slave;
                                if (new_active == old_active) {
                                        /* do nothing */
-                                       pr_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 {
@@ -1314,16 +1192,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                            (old_active) &&
                                            (new_active->link == BOND_LINK_UP) &&
                                            IS_UP(new_active->dev)) {
-                                               pr_info(DRV_NAME
-                                                       ": %s: Setting %s as active slave.\n",
-                                                       bond->dev->name, slave->dev->name);
+                                               pr_info("%s: Setting %s as active slave.\n",
+                                                       bond->dev->name,
+                                                       slave->dev->name);
                                                        bond_change_active_slave(bond, new_active);
                                        }
                                        else {
-                                               pr_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,
+                                               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;
@@ -1334,20 +1211,20 @@ 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') {
-                       pr_info(DRV_NAME
-                               ": %s: Setting active slave to None.\n",
+                       pr_info("%s: Setting active slave to None.\n",
                                bond->dev->name);
                        bond->primary_slave = NULL;
                        bond_select_active_slave(bond);
                } else {
-                       pr_info(DRV_NAME ": %s: Unable to set %.*s"
-                               " as active slave as it is not a slave.\n",
+                       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->curr_slave_lock);
        read_unlock(&bond->lock);
+       unblock_netpoll_tx();
+
        rtnl_unlock();
 
        return count;
@@ -1484,7 +1361,216 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 }
 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,
@@ -1502,6 +1588,7 @@ static struct attribute *per_bond_attrs[] = {
        &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,
@@ -1510,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,
 };
 
@@ -1542,8 +1632,7 @@ int bond_create_sysfs(void)
                /* 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",
+                       pr_err("network device named %s already exists in sysfs",
                               class_attr_bonding_masters.attr.name);
                ret = 0;
        }
@@ -1564,24 +1653,8 @@ void bond_destroy_sysfs(void)
  * 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)
-               pr_emerg("eek! didn't create group!\n");
-
-       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;
 }