cvs commit: src/sys/compat/ndis kern_ndis.c src/sys/dev/if_ndis if_ndis_pci.c

[Jeff Roberson]

This wasn't quite right, the following patch fixes the build for me, I
don't know if it's actually correct.

Index: kern_ndis.c
===================================================================
RCS file: /home/ncvs/src/sys/compat/ndis/kern_ndis.c,v
retrieving revision 1.73
diff -u -r1.73 kern_ndis.c
--- kern_ndis.c 27 Mar 2005 10:35:07 -0000      1.73
+++ kern_ndis.c 28 Mar 2005 11:02:47 -0000
@@ -916,7 +916,7 @@
 #if __FreeBSD_version < 600022
        SLIST_INIT(&brl_rev);
 #else
-       STAILQ_INIT(&brl_rev);
+       brl = NULL;
 #endif

        rl = malloc(sizeof(ndis_resource_list) +
@@ -963,7 +963,7 @@

                SLIST_FOREACH(brle, &brl_rev, link) {
 #else
-               STAILQ_FOREACH(brle, &brl, link) {
+               STAILQ_FOREACH(brle, brl, link) {
 #endif
                        switch (brle->type) {
                        case SYS_RES_IOPORT:
@@ -1003,9 +1003,9 @@

        block->nmb_rlist = rl;

+#if __FreeBSD_version < 600022
 bad:

-#if __FreeBSD_version < 600022
        while (!SLIST_EMPTY(&brl_rev)) {
                n = SLIST_FIRST(&brl_rev);
                SLIST_REMOVE_HEAD(&brl_rev, link);


On Sun, 27 Mar 2005, Bill Paul wrote:

> wpaul       2005-03-27 10:35:07 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     sys/compat/ndis      kern_ndis.c
>     sys/dev/if_ndis      if_ndis_pci.c
>   Log:
>   Argh. PCI resource list became an STAILQ instead of an SLIST. Try to
>   deal with this while maintaining backards source compatibility with
>   stable.
>
>   Revision  Changes    Path
>   1.73      +14 -1     src/sys/compat/ndis/kern_ndis.c
>   1.14      +4 -0      src/sys/dev/if_ndis/if_ndis_pci.c
>