Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / bonding / bond_main.c

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a11748b8d69b435cf97971cec21c0340365ed6d1..a8a6c53095186cc32bb3c5ece1aaaff301f5056b 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -6305,6 +6305,7 @@ static int __init bond_check_params(struct bond_params *params)
        params->ad_actor_sys_prio = ad_actor_sys_prio;
        eth_zero_addr(params->ad_actor_system);
        params->ad_user_port_key = ad_user_port_key;
+       params->coupled_control = 1;
        if (packets_per_slave > 0) {
                params->reciprocal_packets_per_slave =
                        reciprocal_value(packets_per_slave);
@@ -6414,28 +6415,41 @@ static int __net_init bond_net_init(struct net *net)
        return 0;
 }
 
-static void __net_exit bond_net_exit_batch(struct list_head *net_list)
+/* According to commit 69b0216ac255 ("bonding: fix bonding_masters
+ * race condition in bond unloading") we need to remove sysfs files
+ * before we remove our devices (done later in bond_net_exit_batch_rtnl())
+ */
+static void __net_exit bond_net_pre_exit(struct net *net)
+{
+       struct bond_net *bn = net_generic(net, bond_net_id);
+
+       bond_destroy_sysfs(bn);
+}
+
+static void __net_exit bond_net_exit_batch_rtnl(struct list_head *net_list,
+                                               struct list_head *dev_kill_list)
 {
        struct bond_net *bn;
        struct net *net;
-       LIST_HEAD(list);
-
-       list_for_each_entry(net, net_list, exit_list) {
-               bn = net_generic(net, bond_net_id);
-               bond_destroy_sysfs(bn);
-       }
 
        /* Kill off any bonds created after unregistering bond rtnl ops */
-       rtnl_lock();
        list_for_each_entry(net, net_list, exit_list) {
                struct bonding *bond, *tmp_bond;
 
                bn = net_generic(net, bond_net_id);
                list_for_each_entry_safe(bond, tmp_bond, &bn->dev_list, bond_list)
-                       unregister_netdevice_queue(bond->dev, &list);
+                       unregister_netdevice_queue(bond->dev, dev_kill_list);
        }
-       unregister_netdevice_many(&list);
-       rtnl_unlock();
+}
+
+/* According to commit 23fa5c2caae0 ("bonding: destroy proc directory
+ * only after all bonds are gone") bond_destroy_proc_dir() is called
+ * after bond_net_exit_batch_rtnl() has completed.
+ */
+static void __net_exit bond_net_exit_batch(struct list_head *net_list)
+{
+       struct bond_net *bn;
+       struct net *net;
 
        list_for_each_entry(net, net_list, exit_list) {
                bn = net_generic(net, bond_net_id);
@@ -6445,6 +6459,8 @@ static void __net_exit bond_net_exit_batch(struct list_head *net_list)
 
 static struct pernet_operations bond_net_ops = {
        .init = bond_net_init,
+       .pre_exit = bond_net_pre_exit,
+       .exit_batch_rtnl = bond_net_exit_batch_rtnl,
        .exit_batch = bond_net_exit_batch,
        .id   = &bond_net_id,
        .size = sizeof(struct bond_net),