From 1a23d6fcb0cc5df7e7353b83e6095055972d354a Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 19 Nov 1999 05:37:37 +0000 Subject: protect some more operations with splimp() under Netgraph. --- sys/dev/sr/if_sr.c | 6 +++--- sys/dev/sr/if_sr_isa.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev/sr') 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: -- cgit v1.1