bond: Be more careful about adding and removing netdevs in the monitor.

The code was careless about updating the netdev_monitor.  Newly added
slaves weren't added to the monitor until the next bond_reconfigure() call,
and netdevs were never removed from the monitor.

diff --git a/lib/bond.c b/lib/bond.c
index 4d7d05a..ed6ed89 100644 (file)
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -369,7 +369,16 @@ bond_slave_register(struct bond *bond, void *slave_, uint16_t stb_id,
         bond->bond_revalidate = true;
     }
 
-    slave->netdev = netdev;
+    if (slave->netdev != netdev) {
+        if (bond->monitor) {
+            if (slave->netdev) {
+                netdev_monitor_remove(bond->monitor, slave->netdev);
+            }
+            netdev_monitor_add(bond->monitor, netdev);
+        }
+        slave->netdev = netdev;
+    }
+
     free(slave->name);
     slave->name = xstrdup(netdev_get_name(netdev));
 }
@@ -388,6 +397,10 @@ bond_slave_unregister(struct bond *bond, const void *slave_)
         return;
     }
 
+    if (bond->monitor) {
+        netdev_monitor_remove(bond->monitor, slave->netdev);
+    }
+
     bond_enable_slave(slave, false, NULL);
 
     del_active = bond->active_slave == slave;