@@ -4490,6 +4490,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
struct ifbond __user *u_binfo = NULL;
struct ifslave k_sinfo;
struct ifslave __user *u_sinfo = NULL;
+ struct nd_lock *nd_lock, *nd_lock2;
struct bond_opt_value newval;
struct net *net;
int res = 0;
@@ -4538,7 +4539,10 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
switch (cmd) {
case SIOCBONDENSLAVE:
+ double_lock_netdev(bond_dev, &nd_lock, slave_dev, &nd_lock2);
+ nd_lock_transfer_devices(&nd_lock, &nd_lock2);
res = bond_enslave(bond_dev, slave_dev, NULL);
+ double_unlock_netdev(nd_lock, nd_lock2);
break;
case SIOCBONDRELEASE:
res = bond_release(bond_dev, slave_dev);
@@ -1605,6 +1605,7 @@ static int bond_option_slaves_set(struct bonding *bond,
const struct bond_opt_value *newval)
{
char command[IFNAMSIZ + 1] = { 0, };
+ struct nd_lock *nd_lock, *nd_lock2;
struct net_device *dev;
char *ifname;
int ret;
@@ -1627,7 +1628,10 @@ static int bond_option_slaves_set(struct bonding *bond,
switch (command[0]) {
case '+':
slave_dbg(bond->dev, dev, "Enslaving interface\n");
+ double_lock_netdev(bond->dev, &nd_lock, dev, &nd_lock2);
+ nd_lock_transfer_devices(&nd_lock, &nd_lock2);
ret = bond_enslave(bond->dev, dev, NULL);
+ double_unlock_netdev(nd_lock, nd_lock2);
break;
case '-':
Signed-off-by: Kirill Tkhai <tkhai@ya.ru> --- drivers/net/bonding/bond_main.c | 4 ++++ drivers/net/bonding/bond_options.c | 4 ++++ 2 files changed, 8 insertions(+)