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

Commit c0f54edb authored by WingMan Kwok's avatar WingMan Kwok Committed by David S. Miller
Browse files

net: netcp: Fixes the use of spin_lock_bh in timer function 



This patch fixes a bug in which the timer routine synchronized
against the ethtool-triggered statistics updates with spin_lock_bh().
A timer function is itself a bottom-half, so this should be
spin_lock().

Signed-off-by: default avatarWingMan Kwok <w-kwok2@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea6f82fe

drivers/net/ethernet/ti/netcp_ethss.c

+3 −2
Original line number Diff line number Diff line
@@ -2189,14 +2189,15 @@ static void netcp_ethss_timer(unsigned long arg) 
		netcp_ethss_update_link_state(gbe_dev, slave, NULL);

	}



	spin_lock_bh(&gbe_dev->hw_stats_lock);

	/* A timer runs as a BH, no need to block them */

	spin_lock(&gbe_dev->hw_stats_lock);



	if (gbe_dev->ss_version == GBE_SS_VERSION_14)

		gbe_update_stats_ver14(gbe_dev, NULL);

	else

		gbe_update_stats(gbe_dev, NULL);



	spin_unlock_bh(&gbe_dev->hw_stats_lock);

	spin_unlock(&gbe_dev->hw_stats_lock);



	gbe_dev->timer.expires	= jiffies + GBE_TIMER_INTERVAL;

	add_timer(&gbe_dev->timer);