diff options
| author | deischen <deischen@FreeBSD.org> | 2003-12-07 06:50:04 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 2003-12-07 06:50:04 +0000 |
| commit | f450a1cf98ab8a0f945dd3dd779e9d3a69ee9555 (patch) | |
| tree | 035ecd375e00847c2a6f1e0e5297bf3f460050ec /sys/dev/em | |
| parent | 61b4091c574da5b368b2d7e0007fa6804fef42d9 (diff) | |
| download | FreeBSD-src-f450a1cf98ab8a0f945dd3dd779e9d3a69ee9555.zip FreeBSD-src-f450a1cf98ab8a0f945dd3dd779e9d3a69ee9555.tar.gz | |
Don't call em_stop() from the watchdog since it requires the controller
mutex to be locked. It is redundant since em_init() is called and this
correctly locks the mutex and calls em_stop().
5.2 release candidate since this can cause a panic if the watchdog
expires.
Tested by: kuriyama
Diffstat (limited to 'sys/dev/em')
| -rw-r--r-- | sys/dev/em/if_em.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index ecb1529..db9fd18 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -768,7 +768,6 @@ em_watchdog(struct ifnet *ifp) ifp->if_flags &= ~IFF_RUNNING; - em_stop(adapter); em_init(adapter); ifp->if_oerrors++; |
