diff options
author | Veaceslav Falico <vfalico@redhat.com> | 2014-02-18 01:48:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-18 16:47:16 -0500 |
commit | 49f17de72174ceb340a96996e14058e8f6ff951d (patch) | |
tree | e5c6f38906a666ffc5b16e25f595069cceca1f3f /drivers/net/bonding/bonding.h | |
parent | 8e603460fa388c89f08e359366ec9398971cf49c (diff) |
bonding: rename last_arp_rx to last_rx
To reflect the new meaning.
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/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 36db702d32e7..430362891d0d 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -190,7 +190,7 @@ struct slave { | |||
190 | int delay; | 190 | int delay; |
191 | /* all three in jiffies */ | 191 | /* all three in jiffies */ |
192 | unsigned long last_link_up; | 192 | unsigned long last_link_up; |
193 | unsigned long last_arp_rx; | 193 | unsigned long last_rx; |
194 | unsigned long target_last_arp_rx[BOND_MAX_ARP_TARGETS]; | 194 | unsigned long target_last_arp_rx[BOND_MAX_ARP_TARGETS]; |
195 | s8 link; /* one of BOND_LINK_XXXX */ | 195 | s8 link; /* one of BOND_LINK_XXXX */ |
196 | s8 new_link; | 196 | s8 new_link; |
@@ -383,7 +383,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond, | |||
383 | if (bond->params.arp_all_targets == BOND_ARP_TARGETS_ALL) | 383 | if (bond->params.arp_all_targets == BOND_ARP_TARGETS_ALL) |
384 | return slave_oldest_target_arp_rx(bond, slave); | 384 | return slave_oldest_target_arp_rx(bond, slave); |
385 | 385 | ||
386 | return slave->last_arp_rx; | 386 | return slave->last_rx; |
387 | } | 387 | } |
388 | 388 | ||
389 | #ifdef CONFIG_NET_POLL_CONTROLLER | 389 | #ifdef CONFIG_NET_POLL_CONTROLLER |