Skip to content

Commit

Permalink
bonding: remove useless updating of slave->dev->last_rx
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Feb 18, 2014
1 parent ff71529 commit f8ff080
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
3 changes: 0 additions & 3 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1115,9 +1115,6 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
slave = bond_slave_get_rcu(skb->dev);
bond = slave->bond;

if (bond->params.arp_interval)
slave->dev->last_rx = jiffies;

recv_probe = ACCESS_ONCE(bond->recv_probe);
if (recv_probe) {
ret = recv_probe(skb, bond, slave);
Expand Down
8 changes: 1 addition & 7 deletions include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -1312,13 +1312,7 @@ struct net_device {
/*
* Cache lines mostly used on receive path (including eth_type_trans())
*/
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.
*/
unsigned long last_rx; /* Time of last Rx */

/* Interface address info used in eth_type_trans() */
unsigned char *dev_addr; /* hw address, (before bcast
Expand Down

0 comments on commit f8ff080

Please sign in to comment.