nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

bonding: remove useless updating of slave->dev->last_rx

Browse source 
Now that all the logic is handled via last_arp_rx, we don't need to use
last_rx.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Veaceslav Falico 2014-02-18 07:48:45 +01:00 committed by David S. Miller
parent ff71529da4
commit f8ff080dac
2 changed files with 1 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/bonding/bond_main.c
View file

@ -1115,9 +1115,6 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
slave = bond_slave_get_rcu(skb->dev); slave = bond_slave_get_rcu(skb->dev);
bond = slave->bond; bond = slave->bond;
if (bond->params.arp_interval)
slave->dev->last_rx = jiffies;
recv_probe = ACCESS_ONCE(bond->recv_probe); recv_probe = ACCESS_ONCE(bond->recv_probe);
if (recv_probe) { if (recv_probe) {
ret = recv_probe(skb, bond, slave); ret = recv_probe(skb, bond, slave);

8
include/linux/netdevice.h
View file

@ -1312,13 +1312,7 @@ struct net_device {
/* /*
* Cache lines mostly used on receive path (including eth_type_trans()) * Cache lines mostly used on receive path (including eth_type_trans())
*/ */
unsigned long last_rx; /* Time of last Rx unsigned long last_rx; /* Time of last Rx */
* This should not be set in
* drivers, unless really needed,
* because network stack (bonding)
* use it if/when necessary, to
* avoid dirtying this cache line.
*/
/* Interface address info used in eth_type_trans() */ /* Interface address info used in eth_type_trans() */
unsigned char *dev_addr; /* hw address, (before bcast unsigned char *dev_addr; /* hw address, (before bcast