34c34
< __FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 123537 2003-12-14 22:47:01Z wpaul $");
---
> __FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 123620 2003-12-18 03:51:21Z wpaul $");
88c88
< { 0, 0, NULL }
---
> { 0, 0, 0, NULL }
181c181,183
< (pci_get_device(dev) == t->ndis_did)) {
---
> (pci_get_device(dev) == t->ndis_did) &&
> (pci_read_config(dev, PCIR_SUBVEND_0, 4) ==
> t->ndis_subsys)) {
203a206,207
> struct ndis_type *t;
> int devidx = 0, defidx = 0;
204a209
>
299a305,328
> /* Figure out exactly which device we matched. */
>
> t = ndis_devs;
>
> while(t->ndis_name != NULL) {
> if ((pci_get_vendor(dev) == t->ndis_vid) &&
> (pci_get_device(dev) == t->ndis_did)) {
> if (t->ndis_subsys == 0)
> defidx = devidx;
> else {
> if (t->ndis_subsys ==
> pci_read_config(dev, PCIR_SUBVEND_0, 4))
> break;
> }
> }
> t++;
> devidx++;
> }
>
> if (ndis_devs[devidx].ndis_name == NULL)
> sc->ndis_devidx = defidx;
> else
> sc->ndis_devidx = devidx;
>