]> err.no Git - linux-2.6/commitdiff
[PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops...
authornsxfreddy@gmail.com <nsxfreddy@gmail.com>
Wed, 21 Sep 2005 19:18:04 +0000 (14:18 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 22 Sep 2005 02:23:13 +0000 (22:23 -0400)
Fix bond_enslave link monitoring warning to check use_carrier status
and ethtool_ops in addition to do_ioctl.  This version checks ethtool_ops
as well as do_ioctl, and also uses the per-bond params.use_carrier
instead of the global use_carrier.

Signed-off-by: Jason R. Martin <nsxfreddy@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/bonding/bond_main.c

index 90449a0f2a6c4454b277d6fa333264a014940794..6d00c3de1a836a8ec703bab4480646a8c6e7aed1 100644 (file)
@@ -1653,7 +1653,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);