aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c3
-rw-r--r--include/linux/netdevice.h8
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e7aab9a6a670..14e023de09d6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1115,9 +1115,6 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
1115 slave = bond_slave_get_rcu(skb->dev); 1115 slave = bond_slave_get_rcu(skb->dev);
1116 bond = slave->bond; 1116 bond = slave->bond;
1117 1117
1118 if (bond->params.arp_interval)
1119 slave->dev->last_rx = jiffies;
1120
1121 recv_probe = ACCESS_ONCE(bond->recv_probe); 1118 recv_probe = ACCESS_ONCE(bond->recv_probe);
1122 if (recv_probe) { 1119 if (recv_probe) {
1123 ret = recv_probe(skb, bond, slave); 1120 ret = recv_probe(skb, bond, slave);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 430c51aed6a4..891432a994c0 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1312,13 +1312,7 @@ struct net_device {
1312/* 1312/*
1313 * Cache lines mostly used on receive path (including eth_type_trans()) 1313 * Cache lines mostly used on receive path (including eth_type_trans())
1314 */ 1314 */
1315 unsigned long last_rx; /* Time of last Rx 1315 unsigned long last_rx; /* Time of last Rx */
1316 * This should not be set in
1317 * drivers, unless really needed,
1318 * because network stack (bonding)
1319 * use it if/when necessary, to
1320 * avoid dirtying this cache line.
1321 */
1322 1316
1323 /* Interface address info used in eth_type_trans() */ 1317 /* Interface address info used in eth_type_trans() */
1324 unsigned char *dev_addr; /* hw address, (before bcast 1318 unsigned char *dev_addr; /* hw address, (before bcast