net/bonding: Destroy bonding master when last slave is gone

When bonding enslaves non Ethernet devices it takes pointers to functions
in the module that owns the slaves. In this case it becomes unsafe
to keep the bonding master registered after last slave was unenslaved
because we don't know if the pointers are still valid.  Destroying the bond when slave_cnt is zero
ensures that these functions be used anymore.

Signed-off-by: Moni Shoua <monis at voltaire.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 583c568e1764..b5d2a13fe627 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -164,9 +164,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                 printk(KERN_INFO DRV_NAME
                                         ": %s is being deleted...\n",
                                         bond->dev->name);
-                                bond_deinit(bond->dev);
-                                bond_destroy_sysfs_entry(bond);
-                                unregister_netdevice(bond->dev);
+                                bond_destroy(bond);
                                 rtnl_unlock();
                                 goto out;
                         }
@@ -363,7 +361,10 @@ static ssize_t bonding_store_slaves(struct device *d,
                         printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                         rtnl_lock();
-                        res = bond_release(bond->dev, dev);
+                        if (bond->setup_by_slave)
+                                res = bond_release_and_destroy(bond->dev, dev);
+                        else
+                                res = bond_release(bond->dev, dev);
                         rtnl_unlock();
                         if (res) {
                                 ret = res;