summaryrefslogtreecommitdiffstats
path: root/sys/dev/ar
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>1999-11-19 05:37:37 +0000
committerjulian <julian@FreeBSD.org>1999-11-19 05:37:37 +0000
commit1a23d6fcb0cc5df7e7353b83e6095055972d354a (patch)
tree2292fe2f7407528fda73ff438c3bbc82c776b161 /sys/dev/ar
parent386cf323ebeae7b8505516bc5efa7b8280cfff6f (diff)
downloadFreeBSD-src-1a23d6fcb0cc5df7e7353b83e6095055972d354a.zip
FreeBSD-src-1a23d6fcb0cc5df7e7353b83e6095055972d354a.tar.gz
protect some more operations with splimp() under Netgraph.
Diffstat (limited to 'sys/dev/ar')
-rw-r--r--sys/dev/ar/if_ar.c6
-rw-r--r--sys/dev/ar/if_ar_isa.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 4d27d72..79bfbba 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -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:
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 4d27d72..79bfbba 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -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:
OpenPOWER on IntegriCloud