Commit 552709d5 authored by nsxfreddy@gmail.com's avatar nsxfreddy@gmail.com Committed by Jeff Garzik
Browse files

[PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops with bonding)



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: default avatarJason R. Martin <nsxfreddy@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent efb0372b
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment