From 4e6f3398cbe34afff9b1cddd9016f60c587c3e8a Mon Sep 17 00:00:00 2001 From: Andrew Gospodarek Date: Fri, 11 Apr 2008 16:46:53 -0400 Subject: [PATCH] bonding fix link monitor capability check RHBZ 441897 Adds a check for ethtool options and a check about whether or not bonding options use_carrier is set before declaring a setup as invalid. --- 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 704eee8..c883da8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1770,7 +1770,8 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de int old_features = bond_dev->features; int res = 0; - if (slave_dev->do_ioctl == NULL) { + if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL && + slave_dev->do_ioctl == NULL) { printk(KERN_WARNING DRV_NAME ": Warning : no link monitoring support for %s\n", slave_dev->name); -- 1.5.2.1