diff options
| author | Veaceslav Falico | 2013-08-03 03:50:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-08-05 21:19:44 +0200 |
| commit | def4460cdb171d64309c927907c18c4efcb0204b (patch) | |
| tree | 5caeb98f8521868af91d283e939d20c479cf6c9d /drivers/net/bonding/bond_main.c | |
| parent | tile: fix missing unlock on error in tile_net_open() (diff) | |
| download | kernel-qcow2-linux-def4460cdb171d64309c927907c18c4efcb0204b.tar.gz kernel-qcow2-linux-def4460cdb171d64309c927907c18c4efcb0204b.tar.xz kernel-qcow2-linux-def4460cdb171d64309c927907c18c4efcb0204b.zip | |
bonding: call slave_last_rx() only once per slave
Simple cleanup to not call slave_last_rx() on every time function. It won't
give any measurable boost - but looks cleaner and easier to understand.
There are no time-consuming functions in between these calls, so it's safe
to call it in the beginning only once.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 476df7d2a354..cc13bfeac449 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2764,7 +2764,7 @@ re_arm: */ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks) { - unsigned long trans_start; + unsigned long trans_start, last_rx; struct slave *slave; int extra_ticks; int commit = 0; @@ -2778,11 +2778,12 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks) bond_for_each_slave(bond, slave) { slave->new_link = BOND_LINK_NOCHANGE; + last_rx = slave_last_rx(bond, slave); if (slave->link != BOND_LINK_UP) { if (time_in_range(jiffies, - slave_last_rx(bond, slave) - delta_in_ticks, - slave_last_rx(bond, slave) + delta_in_ticks + extra_ticks)) { + last_rx - delta_in_ticks, + last_rx + delta_in_ticks + extra_ticks)) { slave->new_link = BOND_LINK_UP; commit++; @@ -2817,8 +2818,8 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks) if (!bond_is_active_slave(slave) && !bond->current_arp_slave && !time_in_range(jiffies, - slave_last_rx(bond, slave) - delta_in_ticks, - slave_last_rx(bond, slave) + 3 * delta_in_ticks + extra_ticks)) { + last_rx - delta_in_ticks, + last_rx + 3 * delta_in_ticks + extra_ticks)) { slave->new_link = BOND_LINK_DOWN; commit++; @@ -2836,8 +2837,8 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks) trans_start - delta_in_ticks, trans_start + 2 * delta_in_ticks + extra_ticks) || !time_in_range(jiffies, - slave_last_rx(bond, slave) - delta_in_ticks, - slave_last_rx(bond, slave) + 2 * delta_in_ticks + extra_ticks))) { + last_rx - delta_in_ticks, + last_rx + 2 * delta_in_ticks + extra_ticks))) { slave->new_link = BOND_LINK_DOWN; commit++; |