diff options
author | David S. Miller <davem@davemloft.net> | 2016-09-13 00:52:44 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-13 00:52:44 +0200 |
commit | b20b378d49926b82c0a131492fa8842156e0e8a9 (patch) | |
tree | 7196847eea049a46442b05f99aee1dc571019381 /drivers/net/bonding | |
parent | net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-b20b378d49926b82c0a131492fa8842156e0e8a9.tar.xz linux-b20b378d49926b82c0a131492fa8842156e0e8a9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig
All conflicts were cases of overlapping commits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index c6a1309b2131..3f31ca32f52b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1341,9 +1341,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) slave_dev->name); } - /* already enslaved */ - if (slave_dev->flags & IFF_SLAVE) { - netdev_dbg(bond_dev, "Error: Device was already enslaved\n"); + /* already in-use? */ + if (netdev_is_rx_handler_busy(slave_dev)) { + netdev_err(bond_dev, + "Error: Device is in use and cannot be enslaved\n"); return -EBUSY; } |