system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-30 16:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: Fix deadlock by double lock

Browse source 
ethtool -S on a DSA interface can deadlock for some switches because
the same lock is taken twice. Use the register read function which
expects the lock to be already held.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Fixes: 31888234b7 ("net: dsa: mv88e6xxx: Replace stats mutex with SMI mutex")
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2015-06-05 01:10:09 +02:00 committed by David S. Miller
parent d691f9e8d4
commit 80edb722b9
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/dsa/mv88e6xxx.c
View file

@ -703,8 +703,8 @@ static void _mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds,
u32 high = 0; u32 high = 0;
if (s->reg >= 0x100) { if (s->reg >= 0x100) {
ret = mv88e6xxx_reg_read(ds, REG_PORT(port), ret = _mv88e6xxx_reg_read(ds, REG_PORT(port),
s->reg - 0x100); s->reg - 0x100);
if (ret < 0) if (ret < 0)
goto error; goto error;
low = ret; low = ret;