Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a7c9726 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

net: Remove usage of net_device last_rx member 



The network stack no longer uses the last_rx member of struct net_device
since the bonding driver switched to use its own private last_rx in
commit 9f242738 ("bonding: use last_arp_rx in slave_last_rx()").

However, some drivers still (ab)use the field for their own purposes and
some driver just update it without actually using it.

Previously, there was an accompanying comment for the last_rx member
added in commit 4dc89133 ("net: add a comment on netdev->last_rx")
which asked drivers not to update is, unless really needed. However,
this commend was removed in commit f8ff080d ("bonding: remove
useless updating of slave->dev->last_rx"), so some drivers added later
on still did update last_rx.

Remove all usage of last_rx and switch three drivers (sky2, atp and
smc91c92_cs) which actually read and write it to use their own private
copy in netdev_priv.

Compile-tested with allyesconfig and allmodconfig on x86 and arm.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9520ed8f

arch/m68k/emu/nfeth.c

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ static inline void recv_packet(struct net_device *dev) 


	skb->protocol = eth_type_trans(skb, dev);

	netif_rx(skb);

	dev->last_rx = jiffies;

	dev->stats.rx_packets++;

	dev->stats.rx_bytes += pktlen;

drivers/net/ethernet/cavium/liquidio/lio_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,6 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
		if (packet_was_received) {

			droq->stats.rx_bytes_received += len;

			droq->stats.rx_pkts_received++;

			netdev->last_rx = jiffies;

		} else {

			droq->stats.rx_dropped++;

			netif_info(lio, rx_err, lio->netdev,

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,6 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
		if (packet_was_received) {

			droq->stats.rx_bytes_received += len;

			droq->stats.rx_pkts_received++;

			netdev->last_rx = jiffies;

		} else {

			droq->stats.rx_dropped++;

			netif_info(lio, rx_err, lio->netdev,

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+0 −1
Original line number Diff line number Diff line
@@ -797,7 +797,6 @@ static void hns_nic_rx_up_pro(struct hns_nic_ring_data *ring_data, 


	skb->protocol = eth_type_trans(skb, ndev);

	(void)napi_gro_receive(&ring_data->napi, skb);

	ndev->last_rx = jiffies;

}



static int hns_desc_unused(struct hnae_ring *ring)

drivers/net/ethernet/intel/e1000e/netdev.c

+3 −3
Original line number Diff line number Diff line
@@ -240,9 +240,9 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
	/* Print netdevice Info */

	if (netdev) {

		dev_info(&adapter->pdev->dev, "Net device Info\n");

		pr_info("Device Name     state            trans_start      last_rx\n");

		pr_info("%-15s %016lX %016lX %016lX\n", netdev->name,

			netdev->state, dev_trans_start(netdev), netdev->last_rx);

		pr_info("Device Name     state            trans_start\n");

		pr_info("%-15s %016lX %016lX\n", netdev->name,

			netdev->state, dev_trans_start(netdev));

	}



	/* Print Registers */