From: Mitch Williams <mitch.a.williams@intel.com>
Date: Wed, 9 Nov 2005 18:36:19 +0000 (-0800)
Subject: [PATCH] bonding: Allow ARP target table to have empty entries
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~96^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b780567223524cac86c745aeac425521cf37490;p=linux-2.6

[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>
---

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 73c9dd63e9..b656e53f46 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");