Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8047637c authored May 17, 2008 by Pavel Emelyanov Committed by Jeff Garzik May 22, 2008

bonding: Remove unneeded list_empty checks.



Some places iterate over the checked list right after the check
itself, so even if the list is empty, the list_for_each_xxx
iterator will make everything right by himself.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 0883beca

drivers/net/bonding/bond_main.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2433,9 +2433,6 @@ static int bond_has_this_ip(struct bonding *bond, __be32 ip)
		if (ip == bond->master_ip)
		return 1;

		if (list_empty(&bond->vlan_list))
		return 0;

		list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
		if (ip == vlan->vlan_ip)
		return 1;
		@@ -3495,9 +3492,6 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
		}
		}

		if (list_empty(&bond->vlan_list))
		continue;

		list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
		vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
		if (vlan_dev == event_dev) {