diff options
| author |   Stephen Hemminger <shemminger@linux-foundation.org> | 2007-12-03 17:02:17 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-12-04 14:53:22 -0500 |
| commit | 8cfcbe998aa0459e20bbad61376f81c1715b25d6 (patch) | |
| tree | 828292f0360481a8d6e1f9b3386321ec6fba788d /drivers/net/sky2.c | |
| parent | Fix memory corruption in fec_mpc52xx (diff) | |
| download | linux-dev-8cfcbe998aa0459e20bbad61376f81c1715b25d6.tar.xz linux-dev-8cfcbe998aa0459e20bbad61376f81c1715b25d6.zip | |
sky2: recovery deadlock fix
Prevent deadlock in sky2 recovery logic. sky2_down calls napi_synchronize
which gets stuck if napi was already disabled.
Fix by rearranging slightly and not calling napi_disable until after
both ports are stopped. The napi_disable probably is being overly
paranoid, but it is safe now.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/sky2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3d1dfc948405..6197afb3ed83 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2906,16 +2906,14 @@ static void sky2_restart(struct work_struct *work) int i, err; rtnl_lock(); - sky2_write32(hw, B0_IMSK, 0); - sky2_read32(hw, B0_IMSK); - napi_disable(&hw->napi); - for (i = 0; i < hw->ports; i++) { dev = hw->dev[i]; if (netif_running(dev)) sky2_down(dev); } + napi_disable(&hw->napi); + sky2_write32(hw, B0_IMSK, 0); sky2_reset(hw); sky2_write32(hw, B0_IMSK, Y2_IS_BASE); napi_enable(&hw->napi); |