iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sfp: swap order of rtnl and st_mutex locks

Browse Source 
Swap the order of the rtnl and st_mutex locks - st_mutex is now nested
beneath rtnl lock instead of rtnl being beneath st_mutex. This will
allow us to hold st_mutex only while manipulating the module's hardware
or software control state.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle) 2023-05-17 11:37:57 +01:00 committed by Jakub Kicinski
parent d47e5a430d
commit a9fe964e7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/sfp.c
View File

@ -2600,8 +2600,8 @@ static void sfp_check_state(struct sfp *sfp)
{
unsigned int state, i, changed;
mutex_lock(&sfp->st_mutex);
rtnl_lock();
mutex_lock(&sfp->st_mutex);
state = sfp_get_state(sfp);
changed = state ^ sfp->state;
if (sfp->tx_fault_ignore)
@ -2628,8 +2628,8 @@ static void sfp_check_state(struct sfp *sfp)
if (changed & SFP_F_LOS)
sfp_sm_event(sfp, state & SFP_F_LOS ?
SFP_E_LOS_HIGH : SFP_E_LOS_LOW);
rtnl_unlock();
mutex_unlock(&sfp->st_mutex);
rtnl_unlock();
}
static irqreturn_t sfp_irq(int irq, void *data)