bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "sh_eth: remove open coded netif_running()"

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

Reported-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230327152112.15635-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Wolfram Sang 2023-03-27 17:21:12 +02:00 • committed by Jakub Kicinski
parent 2600badfea
commit cdeccd13a0
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/renesas/sh_eth.c
View file

@ -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;

1
drivers/net/ethernet/renesas/sh_eth.h
View file

@ -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;
};