aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2008-11-03 21:16:50 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-03 21:16:50 -0500
commit6cf3f41e6c08bca6641a695449791c38a25f35ff (patch)
treea4e173960afe6712c112b3ddea1f229a695b7089 /drivers/net/bonding/bond_main.c
parent24f8b2385e03a4f4c8dac513d03b5eaa475822b9 (diff)
bonding, net: Move last_rx update into bonding recv logic
The only user of the net_device->last_rx field is bonding. This patch adds a conditional update of last_rx to the bonding special logic in skb_bond_should_drop, causing last_rx to only be updated when the ARP monitor is running. This frees network device drivers from the necessity of updating last_rx, which can have cache line thrash issues. Signed-off-by: Jay Vosburgh <fubar@us.ibm.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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 56c823c175fe..39575d764974 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4564,6 +4564,8 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
4564 bond_dev->tx_queue_len = 0; 4564 bond_dev->tx_queue_len = 0;
4565 bond_dev->flags |= IFF_MASTER|IFF_MULTICAST; 4565 bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;
4566 bond_dev->priv_flags |= IFF_BONDING; 4566 bond_dev->priv_flags |= IFF_BONDING;
4567 if (bond->params.arp_interval)
4568 bond_dev->priv_flags |= IFF_MASTER_ARPMON;
4567 4569
4568 /* At first, we block adding VLANs. That's the only way to 4570 /* At first, we block adding VLANs. That's the only way to
4569 * prevent problems that occur when adding VLANs over an 4571 * prevent problems that occur when adding VLANs over an