From 71d957b708e40fabd0201a6fe3afacf6e0f09ca2 Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@gmail.com>
Date: Sun, 18 Sep 2005 00:24:12 -0700
Subject: [PATCH] --- yaml --- r: 9067 b: refs/heads/master c:
 40abc27066c49b2c13c817154d438431b0303b96 h: refs/heads/master i:   9065:
 be3e57d674ca9af859eb040e03ab023db9b87d57   9063:
 5886e66487094e58e96b795f7cebae74adbc240c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c3ea64c5382..8f57c871c4ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88f964db6ef728982734356bf4c406270ea29c1d
+refs/heads/master: 40abc27066c49b2c13c817154d438431b0303b96
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index f8dedb623dc0..90449a0f2a6c 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -5039,6 +5039,14 @@ static int __init bonding_init(void)
 	return 0;
 
 out_err:
+	/*
+	 * rtnl_unlock() will run netdev_run_todo(), putting the
+	 * thus-far-registered bonding devices into a state which
+	 * unregigister_netdevice() will accept
+	 */
+	rtnl_unlock();
+	rtnl_lock();
+
 	/* free and unregister all bonds that were successfully added */
 	bond_free_all();