Commit 805d157e authored Feb 12, 2014 by dingtianhong Committed by David S. Miller Feb 13, 2014

bonding: remove the redundant judgements for bond_set_mac_address()

The dev_set_mac_address() will check the dev->netdev_ops->ndo_set_mac_address,
so no need to check it in bond_set_mac_address().

Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Veaceslav Falico <vfalico@redhat.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 25f929fb

drivers/net/bonding/bond_main.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -3461,15 +3461,7 @@ static int bond_set_mac_address(struct net_device bond_dev, void addr)
		*/

		bond_for_each_slave(bond, slave, iter) {
		const struct net_device_ops *slave_ops = slave->dev->netdev_ops;
		pr_debug("slave %p %s\n", slave, slave->dev->name);

		if (slave_ops->ndo_set_mac_address == NULL) {
		res = -EOPNOTSUPP;
		pr_debug("EOPNOTSUPP %s\n", slave->dev->name);
		goto unwind;
		}

		res = dev_set_mac_address(slave->dev, addr);
		if (res) {
		/* TODO: consider downing the slave