2012-11-07 03:19:53

by zheng.li

Subject: [PATCH] bonding: rlb mode of bond should not alter ARP replies originating via bridge

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 <[email protected]>
Cc: Jay Vosburgh <[email protected]>
Cc: Andy Gospodarek <[email protected]>
Cc: "David S. Miller" <[email protected]>

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

2012-11-09 21:25:31

by David Miller

Subject: Re: [PATCH] bonding: rlb mode of bond should not alter ARP replies originating via bridge

From: Zheng Li <[email protected]>
Date: Wed, 7 Nov 2012 11:23:00 +0800

> 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 <[email protected]>

Please format these change properly, this is not indented
correctly at all:

> + 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;

Arguments to functions should line up, always, with the first column
after the openning parenthesis of the function call.

If that makes the far right column of the line go too far past
80 columns, too bad. Make and use a helper function to perform
this test in that case.

Thanks.