summaryrefslogtreecommitdiffstats
path: root/sys/compat
diff options
context:
space:
mode:
authorwpaul <wpaul@FreeBSD.org>2005-05-08 23:19:20 +0000
committerwpaul <wpaul@FreeBSD.org>2005-05-08 23:19:20 +0000
commit51b4d0ab7185a276a61d4152968bb0e56b681b12 (patch)
treeb0411028ee76fc24e1a194e837f7f1f5b41bab82 /sys/compat
parentebc77ad8939abbd4361290c615b7ad4b3c52fdfb (diff)
downloadFreeBSD-src-51b4d0ab7185a276a61d4152968bb0e56b681b12.zip
FreeBSD-src-51b4d0ab7185a276a61d4152968bb0e56b681b12.tar.gz
More fixes for multibus drivers. When calling out to the match
function in if_ndis_pci.c and if_ndis_pccard.c, provide the bustype too so the stubs can ignore devlists that don't concern them.
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/ndis/kern_windrv.c2
-rw-r--r--sys/compat/ndis/ntoskrnl_var.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index afaf638..06a48e5 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -204,7 +204,7 @@ windrv_match(matchfunc, ctx)
STAILQ_FOREACH(d, &drvdb_head, link) {
if (d->windrv_devlist == NULL)
continue;
- match = matchfunc(d->windrv_devlist, ctx);
+ match = matchfunc(d->windrv_bustype, d->windrv_devlist, ctx);
if (match == TRUE) {
mtx_unlock(&drvdb_mtx);
return(d);
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index db736fa..3db1e4e 100644
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ b/sys/compat/ndis/ntoskrnl_var.h
@@ -1225,7 +1225,7 @@ struct drvdb_ent {
extern image_patch_table ntoskrnl_functbl[];
typedef void (*funcptr)(void);
-typedef int (*matchfuncptr)(void *, void *);
+typedef int (*matchfuncptr)(interface_type, void *, void *);
__BEGIN_DECLS
extern int windrv_libinit(void);
OpenPOWER on IntegriCloud