bonding: fix merge issue introduced by 21844825.

Manual merge of fix 17557056 from uek2 into uek4 thru 21844825 resulted
in bonding arp monitor sending arp requests but whose arp replies were
being ignored or not inspected. This bug fixes it.

Orabug: 22025692

Signed-off-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Signed-off-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e76898705f1e3120c8fa54917cf5cd5b4ddbf69d..454f780a17efb47b05f67816ddec626e003c92a8 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2838,8 +2838,8 @@ static void bond_activebackup_arp_mon(struct work_struct *work)
                rcu_read_lock();
        }
 
-       should_notify_rtnl = bond_ab_arp_probe(bond);
        bond->arp_sent = false;
+       should_notify_rtnl = bond_ab_arp_probe(bond);
        rcu_read_unlock();
 
 re_arm: