From: Rama Nichanamatlu Date: Tue, 20 Oct 2015 06:24:53 +0000 (-0700) Subject: bonding: fix merge issue introduced by 21844825. X-Git-Tag: v4.1.12-92~253^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b9adb73da8290bec020bd2dac46dbed246a11c4;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Venkat Venkatsubra --- diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e76898705f1e..454f780a17ef 100644 --- 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: