summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authordingtianhong2014-02-10 09:33:59 +0100
committerDavid S. Miller2014-02-11 01:54:29 +0100
commit6b8790b5006b5ca3ee1c039c3c909833d7958716 (patch)
tree8604c7edd2a28c6ecc50e31a26932413823d9016 /drivers/net/bonding
parentUSB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support (diff)
downloadkernel-qcow2-linux-6b8790b5006b5ca3ee1c039c3c909833d7958716.tar.gz
kernel-qcow2-linux-6b8790b5006b5ca3ee1c039c3c909833d7958716.tar.xz
kernel-qcow2-linux-6b8790b5006b5ca3ee1c039c3c909833d7958716.zip
bonding: remove unwanted bond lock for enslave processing
The bond enslave processing don't hold bond->lock anymore, so release an unlocked rw lock will cause warning message, remove the unwanted read_unlock(&bond->lock). Cc: Jay Vosburgh <fubar@us.ibm.com> Cc: Veaceslav Falico <vfalico@redhat.com> Cc: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Acked-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 35f7e90aef72..71ba18efa15b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1510,7 +1510,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
slave_dev->npinfo = bond->dev->npinfo;
if (slave_dev->npinfo) {
if (slave_enable_netpoll(new_slave)) {
- read_unlock(&bond->lock);
pr_info("Error, %s: master_dev is using netpoll, "
"but new slave device does not support netpoll.\n",
bond_dev->name);