From a5a905cd52069f4183300762456c10841a8dbac6 Mon Sep 17 00:00:00 2001 From: Libor Pechacek Date: Fri, 21 Mar 2008 22:29:35 -0700 Subject: [PATCH] --- yaml --- r: 87813 b: refs/heads/master c: 92b41daa45a505268b11de9b7cbde2c13c0223b5 h: refs/heads/master i: 87811: faee1089c04844376773d2cfd09f85eba3dc3ae5 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 864853c50ed8..53c23372c8c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 966bc6f434df4a02108d01dda8cd52951fe853da +refs/heads/master: 92b41daa45a505268b11de9b7cbde2c13c0223b5 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 2056a872b4f3..0f0675319e9c 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -4528,8 +4528,7 @@ static void bond_free_all(void) netif_tx_unlock_bh(bond_dev); /* Release the bonded slaves */ bond_release_all(bond_dev); - bond_deinit(bond_dev); - unregister_netdevice(bond_dev); + bond_destroy(bond); } #ifdef CONFIG_PROC_FS