diff options
| author | julian <julian@FreeBSD.org> | 1999-11-19 05:37:37 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1999-11-19 05:37:37 +0000 |
| commit | 1a23d6fcb0cc5df7e7353b83e6095055972d354a (patch) | |
| tree | 2292fe2f7407528fda73ff438c3bbc82c776b161 /sys/dev/sr | |
| parent | 386cf323ebeae7b8505516bc5efa7b8280cfff6f (diff) | |
| download | FreeBSD-src-1a23d6fcb0cc5df7e7353b83e6095055972d354a.zip FreeBSD-src-1a23d6fcb0cc5df7e7353b83e6095055972d354a.tar.gz | |
protect some more operations with splimp() under Netgraph.
Diffstat (limited to 'sys/dev/sr')
| -rw-r--r-- | sys/dev/sr/if_sr.c | 6 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 1827793..0bcc23b 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -3296,13 +3296,13 @@ ngsr_watchdog_frame(void * arg) if (sc->out_dog == 0) { log(LOG_ERR, "sr%d: Transmit failure.. no clock?\n", sc->unit); + s = splimp(); srwatchdog(sc); #if 0 - s = splimp(); sr_down(sc); sr_up(sc); - splx(s); #endif + splx(s); sc->inlast = sc->out_deficit = 0; } else { sc->out_dog--; @@ -3466,8 +3466,8 @@ ngsr_rcvdata(hook_p hook, struct mbuf *m, meta_p meta) goto bad; } IF_ENQUEUE(xmitq_p, m); - splx(s); srstart(sc); + splx(s); return (0); bad: diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index 1827793..0bcc23b 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -3296,13 +3296,13 @@ ngsr_watchdog_frame(void * arg) if (sc->out_dog == 0) { log(LOG_ERR, "sr%d: Transmit failure.. no clock?\n", sc->unit); + s = splimp(); srwatchdog(sc); #if 0 - s = splimp(); sr_down(sc); sr_up(sc); - splx(s); #endif + splx(s); sc->inlast = sc->out_deficit = 0; } else { sc->out_dog--; @@ -3466,8 +3466,8 @@ ngsr_rcvdata(hook_p hook, struct mbuf *m, meta_p meta) goto bad; } IF_ENQUEUE(xmitq_p, m); - splx(s); srstart(sc); + splx(s); return (0); bad: |
