From 0bb46c32d25fcd5acf6e6dd8edcbc7ba4a85372d Mon Sep 17 00:00:00 2001 From: Jay Vosburgh Date: Tue, 19 Jun 2007 11:12:12 -0700 Subject: [PATCH] --- yaml --- r: 57913 b: refs/heads/master c: 3201e656ce56ed02e9501906c18ffe16ae350a52 h: refs/heads/master i: 57911: 452327b250cbc7e5e7a7313e625d0db86760fcf7 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- trunk/drivers/net/bonding/bond_sysfs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d9a37011a41..2fab8e9fcd9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a2c892daaf54b31a70785c2821771e8094188ed +refs/heads/master: 3201e656ce56ed02e9501906c18ffe16ae350a52 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 223517dcbcfd..6287ffbda7f7 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -4345,8 +4345,8 @@ static void bond_free_all(void) bond_mc_list_destroy(bond); /* Release the bonded slaves */ bond_release_all(bond_dev); - unregister_netdevice(bond_dev); bond_deinit(bond_dev); + unregister_netdevice(bond_dev); } #ifdef CONFIG_PROC_FS diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c index a122baa5c7bb..60cccf2aa959 100644 --- a/trunk/drivers/net/bonding/bond_sysfs.c +++ b/trunk/drivers/net/bonding/bond_sysfs.c @@ -164,9 +164,9 @@ 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); - unregister_netdevice(bond->dev); bond_deinit(bond->dev); bond_destroy_sysfs_entry(bond); + unregister_netdevice(bond->dev); rtnl_unlock(); goto out; }