|
@@ -2433,9 +2433,6 @@ static int bond_has_this_ip(struct bonding *bond, __be32 ip)
|
|
if (ip == bond->master_ip)
|
|
if (ip == bond->master_ip)
|
|
return 1;
|
|
return 1;
|
|
|
|
|
|
- if (list_empty(&bond->vlan_list))
|
|
|
|
- return 0;
|
|
|
|
-
|
|
|
|
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
|
|
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
|
|
if (ip == vlan->vlan_ip)
|
|
if (ip == vlan->vlan_ip)
|
|
return 1;
|
|
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) {
|
|
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
|
|
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
|
|
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
|
|
if (vlan_dev == event_dev) {
|
|
if (vlan_dev == event_dev) {
|