diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/net/bonding/bond_main.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -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 90449a0f2a6c..6d00c3de1a83 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -1653,7 +1653,8 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de | |||
| 1653 | int old_features = bond_dev->features; | 1653 | int old_features = bond_dev->features; |
| 1654 | int res = 0; | 1654 | int res = 0; |
| 1655 | 1655 | ||
| 1656 | if (slave_dev->do_ioctl == NULL) { | 1656 | if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL && |
| 1657 | slave_dev->do_ioctl == NULL) { | ||
| 1657 | printk(KERN_WARNING DRV_NAME | 1658 | printk(KERN_WARNING DRV_NAME |
| 1658 | ": Warning : no link monitoring support for %s\n", | 1659 | ": Warning : no link monitoring support for %s\n", |
| 1659 | slave_dev->name); | 1660 | slave_dev->name); |