On Thu, Jun 02, 2011 at 11:55:54PM +0200, Mark Kettenis wrote:
> > Date: Thu, 2 Jun 2011 22:49:43 +0100
> > From: Owain Ainsworth <zer...@googlemail.com>
> >
> > Been running with this for a couple of weeks, seems to work fine.
> >
> > ok?
> >
> > diff --git dev/pci/if_iwn.c dev/pci/if_iwn.c
> > index 16765f4..a54556b 100644
> > --- dev/pci/if_iwn.c
> > +++ dev/pci/if_iwn.c
> > @@ -338,7 +338,8 @@ iwn_attach(struct device *parent, struct device *self,
> > void *aux)
> > }
> >
> > /* Install interrupt handler. */
> > - if (pci_intr_map(pa, &ih) != 0) {
> > + if (pci_intr_map_msi(pa, &ih) != 0 &&
> > + pci_intr_map(pa, &ih) != 0) {
> > printf(": can't map interrupt\n");
> > return;
> > }
>
> Please keep those calls on a single line, to keep this consistent with
> the other wireless drivers.
I forgot about this diff for a while, but sure:
ok?
diff --git dev/pci/if_iwn.c dev/pci/if_iwn.c
index 16765f4..4ebcb95 100644
--- dev/pci/if_iwn.c
+++ dev/pci/if_iwn.c
@@ -338,7 +338,7 @@ iwn_attach(struct device *parent, struct device *self, void
*aux)
}
/* Install interrupt handler. */
- if (pci_intr_map(pa, &ih) != 0) {
+ if (pci_intr_map_msi(pa, &ih) != 0 && pci_intr_map(pa, &ih) != 0) {
printf(": can't map interrupt\n");
return;
}
--
There is no such thing as fortune. Try again.
