diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-30 03:50:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-30 03:55:20 -0400 |
commit | 58717686cf7c7f5a70b3a8907ade8a3ce74306b1 (patch) | |
tree | 57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7 /drivers/net/bonding | |
parent | cff63a52924c6a78fa525c67d81480c85736ff3c (diff) | |
parent | 79f632c71bea0d0864d84d6a4ce78da5a9430f5b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h
Most conflicts were minor overlapping stuff.
The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 532153db1f9c..d0aade04e49a 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1917,14 +1917,16 @@ err_detach: | |||
1917 | bond_detach_slave(bond, new_slave); | 1917 | bond_detach_slave(bond, new_slave); |
1918 | if (bond->primary_slave == new_slave) | 1918 | if (bond->primary_slave == new_slave) |
1919 | bond->primary_slave = NULL; | 1919 | bond->primary_slave = NULL; |
1920 | write_unlock_bh(&bond->lock); | ||
1921 | if (bond->curr_active_slave == new_slave) { | 1920 | if (bond->curr_active_slave == new_slave) { |
1921 | bond_change_active_slave(bond, NULL); | ||
1922 | write_unlock_bh(&bond->lock); | ||
1922 | read_lock(&bond->lock); | 1923 | read_lock(&bond->lock); |
1923 | write_lock_bh(&bond->curr_slave_lock); | 1924 | write_lock_bh(&bond->curr_slave_lock); |
1924 | bond_change_active_slave(bond, NULL); | ||
1925 | bond_select_active_slave(bond); | 1925 | bond_select_active_slave(bond); |
1926 | write_unlock_bh(&bond->curr_slave_lock); | 1926 | write_unlock_bh(&bond->curr_slave_lock); |
1927 | read_unlock(&bond->lock); | 1927 | read_unlock(&bond->lock); |
1928 | } else { | ||
1929 | write_unlock_bh(&bond->lock); | ||
1928 | } | 1930 | } |
1929 | slave_disable_netpoll(new_slave); | 1931 | slave_disable_netpoll(new_slave); |
1930 | 1932 | ||