summaryrefslogtreecommitdiffstats
path: root/sys/dev/ed/if_ed_pci.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2005-08-28 23:56:25 +0000
committerimp <imp@FreeBSD.org>2005-08-28 23:56:25 +0000
commit0a15fd3fab8e1aaf0d2441f4766f44d2963ce0fb (patch)
tree7b1691cb23490adfbf5bb0159078c6ff7ab8d83a /sys/dev/ed/if_ed_pci.c
parent3041058fada4e43fce4a29b8186c157e2a2e516f (diff)
downloadFreeBSD-src-0a15fd3fab8e1aaf0d2441f4766f44d2963ce0fb.zip
FreeBSD-src-0a15fd3fab8e1aaf0d2441f4766f44d2963ce0fb.tar.gz
Finish conversion to bus space and make ed MP safe.
o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
Diffstat (limited to 'sys/dev/ed/if_ed_pci.c')
-rw-r--r--sys/dev/ed/if_ed_pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 398d340..c9722c0 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_arp.h>
+#include <net/if_media.h>
#include <net/if_mib.h>
#include <dev/pci/pcireg.h>
@@ -94,7 +95,7 @@ ed_pci_attach(device_t dev)
ed_release_resources(dev);
return (error);
}
- error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
+ error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
edintr, sc, &sc->irq_handle);
if (error) {
ed_release_resources(dev);
OpenPOWER on IntegriCloud