Commit cdeccd13 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jakub Kicinski
Browse files

Revert "sh_eth: remove open coded netif_running()" 



This reverts commit ce1fdb06. It turned
out this actually introduces a race condition. netif_running() is not a
suitable check for get_stats.

Reported-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230327152112.15635-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2600badf

drivers/net/ethernet/renesas/sh_eth.c

+5 −1
Original line number Diff line number Diff line
@@ -2441,6 +2441,8 @@ static int sh_eth_open(struct net_device *ndev) 


	netif_start_queue(ndev);



	mdp->is_opened = 1;



	return ret;



out_free_irq:
@@ -2563,7 +2565,7 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev) 
	if (mdp->cd->no_tx_cntrs)

		return &ndev->stats;



	if (!netif_running(ndev))

	if (!mdp->is_opened)

		return &ndev->stats;



	sh_eth_update_stat(ndev, &ndev->stats.tx_dropped, TROCR);
@@ -2612,6 +2614,8 @@ static int sh_eth_close(struct net_device *ndev) 
	/* Free all the skbuffs in the Rx queue and the DMA buffer. */

	sh_eth_ring_free(ndev);



	mdp->is_opened = 0;



	pm_runtime_put(&mdp->pdev->dev);



	return 0;

drivers/net/ethernet/renesas/sh_eth.h

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ struct sh_eth_private { 


	unsigned no_ether_link:1;

	unsigned ether_link_active_low:1;

	unsigned is_opened:1;

	unsigned wol_enabled:1;

};