3 files changed, 46 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 19fd35175a77..0e198dd87c20 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1257,6 +1257,8 @@ static int bond_compute_features(struct bonding *bond)
 static void bond_setup_by_slave(struct net_device *bond_dev,
                                 struct net_device *slave_dev)
 {
+        struct bonding *bond = bond_dev->priv;
+
         bond_dev->neigh_setup           = slave_dev->neigh_setup;
 
         bond_dev->type              = slave_dev->type;
@@ -1265,6 +1267,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev,
 
         memcpy(bond_dev->broadcast, slave_dev->broadcast,
                 slave_dev->addr_len);
+        bond->setup_by_slave = 1;
 }
 
 /* enslave device <slave> to bond device <master> */
@@ -1828,6 +1831,35 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 }
 
 /*
+* Destroy a bonding device.
+* Must be under rtnl_lock when this function is called.
+*/
+void bond_destroy(struct bonding *bond)
+{
+        bond_deinit(bond->dev);
+        bond_destroy_sysfs_entry(bond);
+        unregister_netdevice(bond->dev);
+}
+
+/*
+* First release a slave and than destroy the bond if no more slaves iare left.
+* Must be under rtnl_lock when this function is called.
+*/
+int  bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+        int ret;
+
+        ret = bond_release(bond_dev, slave_dev);
+        if ((ret == 0) && (bond->slave_cnt == 0)) {
+                printk(KERN_INFO DRV_NAME ": %s: destroying bond %s.\n",
+                       bond_dev->name, bond_dev->name);
+                bond_destroy(bond);
+        }
+        return ret;
+}
+
+/*
  * This function releases all slaves.
  */
 static int bond_release_all(struct net_device *bond_dev)
@@ -3325,6 +3357,11 @@ static int bond_slave_netdev_event(unsigned long event, struct net_device *slave
                  * ... Or is it this?
                  */
                 break;
+        case NETDEV_GOING_DOWN:
+                dprintk("slave %s is going down\n", slave_dev->name);
+                if (bond->setup_by_slave)
+                        bond_release_and_destroy(bond_dev, slave_dev);
+                break;
         case NETDEV_CHANGEMTU:
                 /*
                  * TODO: Should slaves be allowed to
@@ -4298,6 +4335,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
         bond->primary_slave = NULL;
         bond->dev = bond_dev;
         bond->send_grat_arp = 0;
+        bond->setup_by_slave = 0;
         INIT_LIST_HEAD(&bond->vlan_list);
 
         /* Initialize the device entry points */
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;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index e0e06a84b5b9..85e579b0d6f4 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -188,6 +188,7 @@ struct bonding {
         s8       kill_timers;
         s8       do_set_mac_addr;
         s8       send_grat_arp;
+        s8       setup_by_slave;
         struct   net_device_stats stats;
 #ifdef CONFIG_PROC_FS
         struct   proc_dir_entry *proc_entry;
@@ -295,6 +296,8 @@ static inline void bond_unset_master_alb_flags(struct bonding *bond)
 struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
 int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
 int bond_create(char *name, struct bond_params *params, struct bonding **newbond);
+void bond_destroy(struct bonding *bond);
+int  bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev);
 void bond_deinit(struct net_device *bond_dev);
 int bond_create_sysfs(void);
 void bond_destroy_sysfs(void);