summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorwpaul <wpaul@FreeBSD.org>2004-02-11 21:53:40 +0000
committerwpaul <wpaul@FreeBSD.org>2004-02-11 21:53:40 +0000
commit04e0838d2b83ef5245e86e6088b96643d073cf45 (patch)
treed85f543d6e6fb7af828c8d3fbb427fa666f9f412 /sys/dev
parent55ee7cd48644f992a7f8f92bac34a503985ea2d8 (diff)
downloadFreeBSD-src-04e0838d2b83ef5245e86e6088b96643d073cf45.zip
FreeBSD-src-04e0838d2b83ef5245e86e6088b96643d073cf45.tar.gz
Add yet more bulletproofing. This is to guard against the case that
ndis_init_nic() works one during attach, but fails later. Many things will blow up if ndis_init_nic() fails and we aren't careful.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/if_ndis/if_ndis.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 61c6d27..f70d2ec 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -1197,7 +1197,7 @@ ndis_intr(arg)
sc = arg;
ifp = &sc->arpcom.ac_if;
- if (!(ifp->if_flags & IFF_UP) &&
+ if (!(ifp->if_flags & IFF_UP) ||
sc->ndis_block.nmb_miniportadapterctx == NULL)
return;
@@ -1463,7 +1463,8 @@ ndis_init(xsc)
*/
ndis_reset_nic(sc);
ndis_stop(sc);
- ndis_init_nic(sc);
+ if (ndis_init_nic(sc))
+ return;
/* Init our MAC address */
OpenPOWER on IntegriCloud