1 files changed, 9 insertions, 12 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3b31c19972d4..976d28e3498a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2610,19 +2610,16 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 
 static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32 sip, __be32 tip)
 {
-        int i;
-        __be32 *targets = bond->params.arp_targets;
+        if (!sip || !bond_has_this_ip(bond, tip)) {
+                pr_debug("bva: sip %pI4 tip %pI4 not found\n", &sip, &tip);
+                return;
+        }
 
-        for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
-                pr_debug("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
-                         &sip, &tip, i, &targets[i],
-                         bond_has_this_ip(bond, tip));
-                if (sip == targets[i]) {
-                        if (bond_has_this_ip(bond, tip))
-                                slave->last_arp_rx = jiffies;
-                        return;
-                }
+        if (bond_get_targets_ip(bond->params.arp_targets, sip) == -1) {
+                pr_debug("bva: sip %pI4 not found in targets\n", &sip);
+                return;
         }
+        slave->last_arp_rx = jiffies;
 }
 
 static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
@@ -4839,7 +4836,7 @@ static int __net_init bond_net_init(struct net *net)
 
         bond_create_proc_dir(bn);
         bond_create_sysfs(bn);
-        
+
         return 0;
 }