diff options
| author | nikolay@redhat.com <nikolay@redhat.com> | 2013-04-11 09:18:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-01 08:56:37 -0700 |
| commit | 3c53e8d24e96e85acf028dc4ccb1e60a5486f47d (patch) | |
| tree | a1cfccd4a2ecfce89c51c5f160eec9255361b4fb /drivers/net | |
| parent | abd70dfd7e1df706a70fb9fa7d7777cf4428fe2c (diff) | |
| download | kernel_samsung_smdk4412-3c53e8d24e96e85acf028dc4ccb1e60a5486f47d.zip kernel_samsung_smdk4412-3c53e8d24e96e85acf028dc4ccb1e60a5486f47d.tar.gz kernel_samsung_smdk4412-3c53e8d24e96e85acf028dc4ccb1e60a5486f47d.tar.bz2 | |
bonding: IFF_BONDING is not stripped on enslave failure
[ Upstream commit b6a5a7b9a528a8b4c8bec940b607c5dd9102b8cc ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index dd433a7..f271e44 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1949,6 +1949,7 @@ err_detach: write_unlock_bh(&bond->lock); err_close: + slave_dev->priv_flags &= ~IFF_BONDING; dev_close(slave_dev); err_unset_master: |