]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4c537e6) | patch
sky2: recovery deadlock fix
authorStephen Hemminger <shemminger@linux-foundation.org>
Tue, 4 Dec 2007 01:02:17 +0000 (17:02 -0800)
committerJeff Garzik <jeff@garzik.org>
Tue, 4 Dec 2007 19:53:22 +0000 (14:53 -0500)
commit8cfcbe998aa0459e20bbad61376f81c1715b25d6
tree828292f0360481a8d6e1f9b3386321ec6fba788dtree | snapshot
parent4c537e6371a9510c82eb96fb7e1e66017e0e2053commit | diff
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>
drivers/net/sky2.c diff | blob | history
Linux 2.6 source tree