summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorMitch Williams2005-11-09 19:36:19 +0100
committerJohn W. Linville2005-11-13 20:48:20 +0100
commit6b780567223524cac86c745aeac425521cf37490 (patch)
tree98fbe73fc3ec76aa90c1706e42969b799dc0d70a /drivers/net/bonding
parent[PATCH] bonding: make bond_init not __init (diff)
downloadkernel-qcow2-linux-6b780567223524cac86c745aeac425521cf37490.tar.gz
kernel-qcow2-linux-6b780567223524cac86c745aeac425521cf37490.tar.xz
kernel-qcow2-linux-6b780567223524cac86c745aeac425521cf37490.zip
[PATCH] bonding: Allow ARP target table to have empty entries
With the sysfs interface, the user can remove entries from the ARP table at runtime. The ARP monitor code now allows for empty entries in the table. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Acked-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 73c9dd63e985..b656e53f4624 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2729,7 +2729,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
struct flowi fl;
struct rtable *rt;
- for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
+ for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+ if (!targets[i])
+ continue;
dprintk("basa: target %x\n", targets[i]);
if (list_empty(&bond->vlan_list)) {
dprintk("basa: empty vlan: arp_send\n");