diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2011-12-19 22:01:24 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2011-12-19 22:01:24 +0000 |
| commit | 7134bebd3a39e90a50f19c5a347feb38d92a9094 (patch) | |
| tree | 19a7948d7bb35f1fa3e859edae2e0fca9246ed7e /sys | |
| parent | 171a43f15ec99ab27e43ae7883b0c03f96cab754 (diff) | |
fxp_init could bail out on errors without calling slpx.
Change fxp_resume to avoid the nested splnet call inside fxp_init
altogether. Initial diff by Jan Klemkow; Tested and OK bluhm.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/fxp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 9a55d7a5868..b2df07a59d2 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.108 2011/04/07 15:30:16 miod Exp $ */ +/* $OpenBSD: fxp.c,v 1.109 2011/12/19 22:01:23 mpf Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -318,7 +318,9 @@ fxp_resume(void *arg1, void *arg2) { struct fxp_softc *sc = arg1; + int s = splnet(); fxp_init(sc); + splx(s); } /************************************************************* @@ -1165,9 +1167,9 @@ fxp_init(void *xsc) struct fxp_cb_ias *cb_ias; struct fxp_cb_tx *txp; bus_dmamap_t rxmap; - int i, prm, save_bf, lrxen, allm, s, bufs; + int i, prm, save_bf, lrxen, allm, bufs; - s = splnet(); + splassert(IPL_NET); /* * Cancel any pending I/O @@ -1439,7 +1441,6 @@ fxp_init(void *xsc) CSR_WRITE_2(sc, FXP_CSR_SCB_COMMAND, CSR_READ_2(sc, FXP_CSR_SCB_COMMAND) | FXP_SCB_INTRCNTL_REQUEST_SWI); - splx(s); /* * Start stats updater. @@ -1706,6 +1707,8 @@ fxp_mc_setup(struct fxp_softc *sc, int doit) struct ether_multi *enm; int i, nmcasts = 0; + splassert(IPL_NET); + ifp->if_flags &= ~IFF_ALLMULTI; if (ifp->if_flags & IFF_PROMISC || ac->ac_multirangecnt > 0 || |