From: Jay Vosburgh <fubar@us•ibm.com>
To: netdev@vger•kernel.org, jgarzik@pobox•com
Cc: Moni Shoua <monis@voltaire•com>
Subject: [PATCH 7/9] net/bonding: Delay sending of gratuitous ARP to avoid failure
Date: Tue, 9 Oct 2007 19:43:42 -0700 [thread overview]
Message-ID: <11919842281663-git-send-email-fubar@us.ibm.com> (raw)
In-Reply-To: <11919842272176-git-send-email-fubar@us.ibm.com>
From: Moni Shoua <monis@voltaire•com>
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>
---
drivers/net/bonding/bond_main.c | 24 +++++++++++++++++++++---
drivers/net/bonding/bonding.h | 1 +
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7be2336..19fd351 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1103,8 +1103,14 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
if (new_active && !bond->do_set_mac_addr)
memcpy(bond->dev->dev_addr, new_active->dev->dev_addr,
new_active->dev->addr_len);
-
- bond_send_gratuitous_arp(bond);
+ if (bond->curr_active_slave &&
+ 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.
*/
+ 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);
oldcurrent = bond->curr_active_slave;
read_unlock(&bond->curr_slave_lock);
@@ -2474,7 +2491,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
if (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) {
@@ -4280,6 +4297,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
bond->current_arp_slave = NULL;
bond->primary_slave = NULL;
bond->dev = bond_dev;
+ bond->send_grat_arp = 0;
INIT_LIST_HEAD(&bond->vlan_list);
/* Initialize the device entry points */
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index ad9c632..e0e06a8 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -187,6 +187,7 @@ struct bonding {
struct timer_list arp_timer;
s8 kill_timers;
s8 do_set_mac_addr;
+ s8 send_grat_arp;
struct net_device_stats stats;
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc_entry;
--
1.5.3.1
next prev parent reply other threads:[~2007-10-10 2:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-10 2:43 [PATCH 0/9]: bonding support for IPoIB Jay Vosburgh
2007-10-10 2:43 ` [PATCH 1/9] IB/ipoib: Bound the net device to the ipoib_neigh structue Jay Vosburgh
2007-10-10 2:43 ` [PATCH 2/9] IB/ipoib: Verify address handle validity on send Jay Vosburgh
2007-10-10 2:43 ` [PATCH 3/9] net/bonding: Enable bonding to enslave non ARPHRD_ETHER Jay Vosburgh
2007-10-10 2:43 ` [PATCH 4/9] net/bonding: Enable bonding to enslave netdevices not supporting set_mac_address() Jay Vosburgh
2007-10-10 2:43 ` [PATCH 5/9] net/bonding: Enable IP multicast for bonding IPoIB devices Jay Vosburgh
2007-10-10 2:43 ` [PATCH 6/9] net/bonding: Handlle wrong assumptions that slave is always an Ethernet device Jay Vosburgh
2007-10-10 2:43 ` Jay Vosburgh [this message]
2007-10-10 2:43 ` [PATCH 8/9] net/bonding: Destroy bonding master when last slave is gone Jay Vosburgh
2007-10-10 2:43 ` [PATCH 9/9] net/bonding: Optionally allow ethernet slaves to keep own MAC Jay Vosburgh
2007-10-15 18:22 ` [PATCH 1/9] IB/ipoib: Bound the net device to the ipoib_neigh structue Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11919842281663-git-send-email-fubar@us.ibm.com \
--to=fubar@us$(echo .)ibm.com \
--cc=jgarzik@pobox$(echo .)com \
--cc=monis@voltaire$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox