2 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6287ffbda7f7..2bb70e052090 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1390,6 +1390,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 goto err_free;
         }
 
+        res = netdev_set_master(slave_dev, bond_dev);
+        if (res) {
+                dprintk("Error %d calling netdev_set_master\n", res);
+                goto err_close;
+        }
         /* open the slave since the application closed it */
         res = dev_open(slave_dev);
         if (res) {
@@ -1397,12 +1402,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 goto err_restore_mac;
         }
 
-        res = netdev_set_master(slave_dev, bond_dev);
-        if (res) {
-                dprintk("Error %d calling netdev_set_master\n", res);
-                goto err_close;
-        }
-
         new_slave->dev = slave_dev;
         slave_dev->priv_flags |= IFF_BONDING;
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index f96ed76d8fa4..79b79f3de24c 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2268,6 +2268,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                 break;
         case NETDEV_UP:
         case NETDEV_CHANGE:
+                if (dev->flags & IFF_SLAVE)
+                        break;
+
                 if (event == NETDEV_UP) {
                         if (!netif_carrier_ok(dev)) {
                                 /* device is not ready yet. */