From af31ae5340d4a5b87368a35b5606631ecfb48c30 Mon Sep 17 00:00:00 2001 From: Flavio Leitner Date: Tue, 29 Jun 2010 08:24:39 +0000 Subject: [PATCH] --- yaml --- r: 200870 b: refs/heads/master c: 42d782ac1bef7cbcdf05b857731345c6e8149f90 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_alb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 70d1374ad10f..4146d8a40ccb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd1589a431e90f9ff587e640c67101a565e52bba +refs/heads/master: 42d782ac1bef7cbcdf05b857731345c6e8149f90 diff --git a/trunk/drivers/net/bonding/bond_alb.c b/trunk/drivers/net/bonding/bond_alb.c index 40fdc41446cc..df483076eda6 100644 --- a/trunk/drivers/net/bonding/bond_alb.c +++ b/trunk/drivers/net/bonding/bond_alb.c @@ -340,7 +340,8 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp) if ((client_info->assigned) && (client_info->ip_src == arp->ip_dst) && - (client_info->ip_dst == arp->ip_src)) { + (client_info->ip_dst == arp->ip_src) && + (compare_ether_addr_64bits(client_info->mac_dst, arp->mac_src))) { /* update the clients MAC address */ memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN); client_info->ntt = 1;