|
@@ -1390,6 +1390,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
goto err_free;
|
|
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 */
|
|
/* open the slave since the application closed it */
|
|
res = dev_open(slave_dev);
|
|
res = dev_open(slave_dev);
|
|
if (res) {
|
|
if (res) {
|
|
@@ -1397,12 +1402,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
goto err_restore_mac;
|
|
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;
|
|
new_slave->dev = slave_dev;
|
|
slave_dev->priv_flags |= IFF_BONDING;
|
|
slave_dev->priv_flags |= IFF_BONDING;
|
|
|
|
|