aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authornikolay@redhat.com <nikolay@redhat.com>2013-04-11 09:18:56 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-11 16:01:47 -0400
commitb6a5a7b9a528a8b4c8bec940b607c5dd9102b8cc (patch)
treebc29c9f5490ab363d651a73319e8073d3a92b824 /drivers/net
parent6101391d4a381cc0c661d8765235b3cad7da09e5 (diff)
downloadlinux-b6a5a7b9a528a8b4c8bec940b607c5dd9102b8cc.tar.gz
bonding: IFF_BONDING is not stripped on enslave failure
While enslaving a new device and after IFF_BONDING flag is set, in case of failure it is not stripped from the device's priv_flags while cleaning up, which could lead to other problems. Cleaning at err_close because the flag is set after dev_open(). v2: no change Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bonding/bond_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e074c6b5551..a61a760484f 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1906,6 +1906,7 @@ err_detach:
write_unlock_bh(&bond->lock);
err_close:
+ slave_dev->priv_flags &= ~IFF_BONDING;
dev_close(slave_dev);
err_unset_master: