From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: Veaceslav Falico <vfalico@redhat.com>,
Jay Vosburgh <fubar@us.ibm.com>,
Andy Gospodarek <andy@greyhouse.net>
Subject: [PATCH v2 net-next 09/12] bonding: use last_arp_rx in bond_loadbalance_arp_mon()
Date: Fri, 17 Jan 2014 17:58:57 +0100 [thread overview]
Message-ID: <1389977940-17084-10-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1389977940-17084-1-git-send-email-vfalico@redhat.com>
Now that last_arp_rx correctly show the last time we've received an ARP, we
can use it safely instead of slave->dev->last_rx.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
drivers/net/bonding/bond_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 48491d9..eccd407 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2407,7 +2407,7 @@ static void bond_loadbalance_arp_mon(struct work_struct *work)
if (slave->link != BOND_LINK_UP) {
if (bond_time_in_interval(bond, trans_start, 1) &&
- bond_time_in_interval(bond, slave->dev->last_rx, 1)) {
+ bond_time_in_interval(bond, slave->last_arp_rx, 1)) {
slave->link = BOND_LINK_UP;
bond_set_active_slave(slave);
@@ -2436,7 +2436,7 @@ static void bond_loadbalance_arp_mon(struct work_struct *work)
* if we don't know our ip yet
*/
if (!bond_time_in_interval(bond, trans_start, 2) ||
- !bond_time_in_interval(bond, slave->dev->last_rx, 2)) {
+ !bond_time_in_interval(bond, slave->last_arp_rx, 2)) {
slave->link = BOND_LINK_DOWN;
bond_set_backup_slave(slave);
--
1.8.4
next prev parent reply other threads:[~2014-01-17 17:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 16:58 [PATCH v2 net-next 0/12] bonding: add an option to rely on unvalidated arp packets Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 01/12] bonding: remove bond->lock from bond_arp_rcv Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 02/12] bonding: permit using arp_validate with non-ab modes Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 03/12] bonding: always update last_arp_rx on packet recieve Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 04/12] bonding: always set recv_probe to bond_arp_rcv in arp monitor Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 05/12] bonding: extend arp_validate to be able to receive unvalidated arp-only traffic Veaceslav Falico
2014-01-17 20:41 ` Jay Vosburgh
2014-01-23 10:25 ` Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 06/12] bonding: document the new _arp options for arp_validate Veaceslav Falico
2014-01-17 20:38 ` Jay Vosburgh
2014-02-17 13:36 ` Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 07/12] bonding: use the new options to correctly set last_arp_rx Veaceslav Falico
2014-01-17 20:32 ` Neil Horman
2014-01-17 16:58 ` [PATCH v2 net-next 08/12] bonding: use last_arp_rx in slave_last_rx() Veaceslav Falico
2014-01-17 16:58 ` Veaceslav Falico [this message]
2014-01-17 16:58 ` [PATCH v2 net-next 10/12] bonding: remove useless updating of slave->dev->last_rx Veaceslav Falico
2014-01-17 16:58 ` [PATCH v2 net-next 11/12] bonding: trivial: rename slave->jiffies to ->last_link_up Veaceslav Falico
2014-01-17 16:59 ` [PATCH v2 net-next 12/12] bonding: rename last_arp_rx to last_rx Veaceslav Falico
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=1389977940-17084-10-git-send-email-vfalico@redhat.com \
--to=vfalico@redhat.com \
--cc=andy@greyhouse.net \
--cc=fubar@us.ibm.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).