evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/bonding: Delay sending of gratuitous ARP to avoid failure

Browse source 
Delay sending a gratuitous_arp when LINK_STATE_LINKWATCH_PENDING bit
in dev->state field is on. This improves the chances for the arp packet to
be transmitted.

Signed-off-by: Moni Shoua <monis at voltaire.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Moni Shoua 2007-10-09 19:43:42 -07:00 • committed by Jeff Garzik
parent 3158bf7d41
commit 1053f62c24
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/bonding/bond_main.c
View file

@ -1103,8 +1103,14 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
if (new_active && !bond->do_set_mac_addr) if (new_active && !bond->do_set_mac_addr)
memcpy(bond->dev->dev_addr, new_active->dev->dev_addr, memcpy(bond->dev->dev_addr, new_active->dev->dev_addr,
new_active->dev->addr_len); new_active->dev->addr_len);
if (bond->curr_active_slave &&
bond_send_gratuitous_arp(bond); test_bit(__LINK_STATE_LINKWATCH_PENDING,
&bond->curr_active_slave->dev->state)) {
dprintk("delaying gratuitous arp on %s\n",
bond->curr_active_slave->dev->name);
bond->send_grat_arp = 1;
} else
bond_send_gratuitous_arp(bond);
} }
} }
@ -2073,6 +2079,17 @@ void bond_mii_monitor(struct net_device *bond_dev)
* program could monitor the link itself if needed. * program could monitor the link itself if needed.
*/ */
if (bond->send_grat_arp) {
if (bond->curr_active_slave && test_bit(__LINK_STATE_LINKWATCH_PENDING,
&bond->curr_active_slave->dev->state))
dprintk("Needs to send gratuitous arp but not yet\n");
else {
dprintk("sending delayed gratuitous arp on on %s\n",
bond->curr_active_slave->dev->name);
bond_send_gratuitous_arp(bond);
bond->send_grat_arp = 0;
}
}
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
oldcurrent = bond->curr_active_slave; oldcurrent = bond->curr_active_slave;
read_unlock(&bond->curr_slave_lock); read_unlock(&bond->curr_slave_lock);
@ -2474,7 +2491,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
if (bond->master_ip) { if (bond->master_ip) {
bond_arp_send(slave->dev, ARPOP_REPLY, bond->master_ip, bond_arp_send(slave->dev, ARPOP_REPLY, bond->master_ip,
bond->master_ip, 0); bond->master_ip, 0);
} }
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
@ -4280,6 +4297,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
bond->current_arp_slave = NULL; bond->current_arp_slave = NULL;
bond->primary_slave = NULL; bond->primary_slave = NULL;
bond->dev = bond_dev; bond->dev = bond_dev;
bond->send_grat_arp = 0;
INIT_LIST_HEAD(&bond->vlan_list); INIT_LIST_HEAD(&bond->vlan_list);
/* Initialize the device entry points */ /* Initialize the device entry points */

1
drivers/net/bonding/bonding.h
View file

@ -187,6 +187,7 @@ struct bonding {
struct timer_list arp_timer; struct timer_list arp_timer;
s8 kill_timers; s8 kill_timers;
s8 do_set_mac_addr; s8 do_set_mac_addr;
s8 send_grat_arp;
struct net_device_stats stats; struct net_device_stats stats;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc_entry; struct proc_dir_entry *proc_entry;