diff options
| author | nikolay@redhat.com <nikolay@redhat.com> | 2013-04-11 09:18:56 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:36 +0100 |
| commit | 70c560e9ec8ab16abcb2a7dc5d2e4ff21dec2f95 (patch) | |
| tree | bcdb1137dcc00267f2965c85115c637b983bdde6 | |
| parent | 12f7b44dbf5cfc5bfd4db7ce03998dbc5adf7d38 (diff) | |
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: Ben Hutchings <ben@decadent.org.uk>
| -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 2589e57f92a..b436b84de12 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1866,6 +1866,7 @@ err_detach: write_unlock_bh(&bond->lock); err_close: + slave_dev->priv_flags &= ~IFF_BONDING; dev_close(slave_dev); err_unset_master: |