protect some more operations with splimp() under Netgraph.

This commit is contained in:
julian 1999-11-19 05:37:37 +00:00
parent 386cf323eb
commit 1a23d6fcb0
6 changed files with 18 additions and 18 deletions

View File

@ -2137,13 +2137,13 @@ ngar_watchdog_frame(void * arg)
if (sc->out_dog == 0) {
log(LOG_ERR, "ar%d: Transmit failure.. no clock?\n",
sc->unit);
s = splimp();
arwatchdog(sc);
#if 0
s = splimp();
ar_down(sc);
ar_up(sc);
splx(s);
#endif
splx(s);
sc->inlast = sc->out_deficit = 0;
} else {
sc->out_dog--;
@ -2304,8 +2304,8 @@ ngar_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
goto bad;
}
IF_ENQUEUE(xmitq_p, m);
splx(s);
arstart(sc);
splx(s);
return (0);
bad:

View File

@ -2137,13 +2137,13 @@ ngar_watchdog_frame(void * arg)
if (sc->out_dog == 0) {
log(LOG_ERR, "ar%d: Transmit failure.. no clock?\n",
sc->unit);
s = splimp();
arwatchdog(sc);
#if 0
s = splimp();
ar_down(sc);
ar_up(sc);
splx(s);
#endif
splx(s);
sc->inlast = sc->out_deficit = 0;
} else {
sc->out_dog--;
@ -2304,8 +2304,8 @@ ngar_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
goto bad;
}
IF_ENQUEUE(xmitq_p, m);
splx(s);
arstart(sc);
splx(s);
return (0);
bad:

View File

@ -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:

View File

@ -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:

View File

@ -2137,13 +2137,13 @@ ngar_watchdog_frame(void * arg)
if (sc->out_dog == 0) {
log(LOG_ERR, "ar%d: Transmit failure.. no clock?\n",
sc->unit);
s = splimp();
arwatchdog(sc);
#if 0
s = splimp();
ar_down(sc);
ar_up(sc);
splx(s);
#endif
splx(s);
sc->inlast = sc->out_deficit = 0;
} else {
sc->out_dog--;
@ -2304,8 +2304,8 @@ ngar_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
goto bad;
}
IF_ENQUEUE(xmitq_p, m);
splx(s);
arstart(sc);
splx(s);
return (0);
bad:

View File

@ -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: