From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zheng Li Subject: [PATCH] bonding: rlb mode of bond should not alter ARP replies originating via bridge Date: Wed, 7 Nov 2012 11:23:00 +0800 Message-ID: <1352258580-8272-1-git-send-email-zheng.x.li@oracle.com> Cc: linux-kernel@vger.kernel.org, davem@davemloft.net, joe.jin@oracle.com, zheng.x.li@oracle.com To: netdev@vger.kernel.org, fubar@us.ibm.com, andy@greyhouse.net Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org ARP traffic passing through a bridge and out via the bond (when the bond is a port of the bridge) should not have its source MAC address adjusted by the receive load balance code in rlb_arp_xmit. Signed-off-by: Zheng Li Cc: Jay Vosburgh Cc: Andy Gospodarek Cc: "David S. Miller" --- drivers/net/bonding/bond_alb.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index e15cc11..641b3f1 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -700,7 +700,17 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) */ tx_slave = rlb_choose_channel(skb, bond); if (tx_slave) { - memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN); + struct slave *tmp_slave = NULL; + int i = 0; + bond_for_each_slave(bond, tmp_slave, i) { + if (ether_addr_equal_64bits(arp->mac_src, + tmp_slave->dev->dev_addr)) { + memcpy(arp->mac_src, + tx_slave->dev->dev_addr, + ETH_ALEN); + break; + } + } } pr_debug("Server sent ARP Reply packet\n"); } else if (arp->op_code == htons(ARPOP_REQUEST)) { -- 1.7.6.5