---

yaml --- r: 9067 b: refs/heads/master c: 40abc27 h: refs/heads/master i: 9065: be3e57d 9063: 5886e66 v: v3
git-mirror · Sep 18, 2005 · 71d957b · 71d957b
1 parent 8c5da03
commit 71d957b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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();