summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2006-01-13 05:04:27 +0000
committerscottl <scottl@FreeBSD.org>2006-01-13 05:04:27 +0000
commite256afc28c0a9335078fcb4700bcc567aebd033b (patch)
tree1be54639cc970b2d991ced9952436324433d4240
parent1bc9e7ad6db7a092d141d8bbc7a604bc03e09971 (diff)
downloadFreeBSD-src-e256afc28c0a9335078fcb4700bcc567aebd033b.zip
FreeBSD-src-e256afc28c0a9335078fcb4700bcc567aebd033b.tar.gz
Disable interrupts while we are setting up the handler. The interrupt really
shouldn't be set up or enabled until much later, but that will be investigated at a later time.
-rw-r--r--sys/dev/em/if_em.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 7301366..bd3c971 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -2031,6 +2031,12 @@ em_allocate_pci_resources(struct adapter * adapter)
}
/*
+ * XXX The interrupt shouldn't be set up until the driver and the
+ * chip is more initialized.
+ */
+ em_disable_intr(adapter);
+
+ /*
* Try allocating a fast interrupt and the associated deferred
* processing contexts. If that doesn't work, try just using an
* ithread.
@@ -2066,6 +2072,7 @@ em_allocate_pci_resources(struct adapter * adapter)
}
adapter->hw.back = &adapter->osdep;
+ em_enable_intr(adapter);
return(0);
}
OpenPOWER on IntegriCloud