diff options
| author | David S. Miller | 2014-11-22 04:28:24 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-11-22 04:28:24 +0100 |
| commit | 1459143386c5d868c87903b8d433a52cffcf3e66 (patch) | |
| tree | e7878a550aaf6a3af5e84f4258bbcc3bbdd20fef /drivers/net/bonding | |
| parent | Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-1459143386c5d868c87903b8d433a52cffcf3e66.tar.gz kernel-qcow2-linux-1459143386c5d868c87903b8d433a52cffcf3e66.tar.xz kernel-qcow2-linux-1459143386c5d868c87903b8d433a52cffcf3e66.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ieee802154/fakehard.c
A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.
Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index c1d7da427a3e..184c434ae305 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2470,7 +2470,8 @@ static void bond_loadbalance_arp_mon(struct work_struct *work) bond_slave_state_change(bond); if (BOND_MODE(bond) == BOND_MODE_XOR) bond_update_slave_arr(bond, NULL); - } else if (do_failover) { + } + if (do_failover) { block_netpoll_tx(); bond_select_active_slave(bond); unblock_netpoll_tx(); |